summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher N. Hesse <raymanfx@gmail.com>2016-05-30 00:22:20 +0200
committerAndreas Schneider <asn@cryptomilk.org>2016-11-15 08:34:03 +0100
commit585cd3f6459846a544e2791b618b39e7ca21c26d (patch)
tree48e8021ce062cecd61942a8b1908ebbbf434f053
parenta50009c7b0ec24b8f202e3e9579adc647b8aea27 (diff)
downloadandroid_hardware_samsung_slsi_exynos5430-585cd3f6459846a544e2791b618b39e7ca21c26d.tar.gz
android_hardware_samsung_slsi_exynos5430-585cd3f6459846a544e2791b618b39e7ca21c26d.tar.xz
android_hardware_samsung_slsi_exynos5430-585cd3f6459846a544e2791b618b39e7ca21c26d.zip
mobicore: Remove MCI version runtime checks
This finally allows mobicore to initialize successfully and sets up the server (which is now waiting on sockets). Change-Id: Ib92e29c10f4efff4d9fcb407f17700be99dc9050 (cherry picked from commit 4e84bf555e280586e65df7627aa2f303994f5aa5)
-rw-r--r--mobicore/daemon/Daemon/Device/Platforms/Generic/TrustZoneDevice.cpp9
-rw-r--r--mobicore/daemon/Daemon/MobiCoreDriverDaemon.cpp3
2 files changed, 0 insertions, 12 deletions
diff --git a/mobicore/daemon/Daemon/Device/Platforms/Generic/TrustZoneDevice.cpp b/mobicore/daemon/Daemon/Device/Platforms/Generic/TrustZoneDevice.cpp
index 1cc875b..d104926 100644
--- a/mobicore/daemon/Daemon/Device/Platforms/Generic/TrustZoneDevice.cpp
+++ b/mobicore/daemon/Daemon/Device/Platforms/Generic/TrustZoneDevice.cpp
@@ -61,9 +61,6 @@
#define MCI_BUFFER_SIZE (NQ_BUFFER_SIZE + MCP_BUFFER_SIZE)
//------------------------------------------------------------------------------
-MC_CHECK_VERSION(MCI, 0, 2);
-
-//------------------------------------------------------------------------------
__attribute__ ((weak)) MobiCoreDevice *getDeviceInstance(
void
)
@@ -131,12 +128,6 @@ bool TrustZoneDevice::initDevice(
}
mciBuffer = pWsmMcp->virtAddr;
- if (!checkMciVersion())
- {
- LOG_E("checkMciVersion failed");
- return false;
- }
-
// Only do a fastcall if MCI has not been reused (MC already initialized)
if (!mciReused)
{
diff --git a/mobicore/daemon/Daemon/MobiCoreDriverDaemon.cpp b/mobicore/daemon/Daemon/MobiCoreDriverDaemon.cpp
index edac844..576dc88 100644
--- a/mobicore/daemon/Daemon/MobiCoreDriverDaemon.cpp
+++ b/mobicore/daemon/Daemon/MobiCoreDriverDaemon.cpp
@@ -143,9 +143,6 @@ void MobiCoreDriverDaemon::run(
// start device (scheduler)
mobiCoreDevice->start();
- LOG_I_RELEASE("Checking version of <t-base");
- checkMobiCoreVersion(mobiCoreDevice);
-
// Load device driver if requested
if (loadDriver) {
for (unsigned int i = 0; i < drivers.size(); i++)