From b9b4df06ddb81a6d14354fc0d42e22acf0b4c30c Mon Sep 17 00:00:00 2001 From: xmarvla Date: Thu, 16 Jun 2011 14:45:38 +0100 Subject: LCM R1T and LCDriver R1N official release. ST-Ericsson ID: 345044 ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10204 Change-Id: Ib1901abfc2efa6c887c70b8583ddd2258e21aa78 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/25187 Tested-by: Vlatko STENKOSKI Tested-by: Cvetko MLADENOVSKI Tested-by: Aleksandar GASOSKI Reviewed-by: Zoran ANCEVSKI Reviewed-by: QATEST Reviewed-by: Vlatko PISTOLOV Conflicts: lcmodule/win_binaries/LCM.dll win_binaries/LCDriver_CNH1606432.dll --- source/LCDriverMethods.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/LCDriverMethods.cpp') diff --git a/source/LCDriverMethods.cpp b/source/LCDriverMethods.cpp index 22c4923..7a54ecc 100644 --- a/source/LCDriverMethods.cpp +++ b/source/LCDriverMethods.cpp @@ -398,7 +398,7 @@ int CLCDriverMethods::Do_Initialize(void **ppInstance) } VERIFY_SUCCESS(m_pLcmInterface->CommunicationInitialize(this, m_CurrentProtocolFamily, m_pHashDevice, m_pCommunicationDevice, m_CurrentCEHCallback, &BufferFunctions, &TimerFunctions, &QueueFunctions)); - *ppInstance = m_pLcmInterface->getLCMContext(); + *ppInstance = m_pCommunicationDevice; // Create main thread if (m_pTimer) { @@ -725,7 +725,7 @@ int CLCDriverMethods::Done_System_GetControlKeys(TSIMLockKeys *pSIMLockKeys) pSIMLockKeys->pchPCKLock, pSIMLockKeys->pchESLCKLock, pSIMLockKeys->pchNLCKUnLock, pSIMLockKeys->pchNSLCKUnLock, pSIMLockKeys->pchSPLCKUnLock, pSIMLockKeys->pchCLCKUnLock, - pSIMLockKeys->pchPCKLock, pSIMLockKeys->pchESLCKUnLock)); + pSIMLockKeys->pchPCKUnLock, pSIMLockKeys->pchESLCKUnLock)); VERIFY_SUCCESS(WaitForEvent(EVENT_GR_RECEIVED, GROUP_SYSTEM, COMMAND_SYSTEM_AUTHENTICATE)); ErrorExit: @@ -2147,7 +2147,7 @@ int CLCDriverMethods::Do_Z_Exit_Z_Protocol() VERIFY_SUCCESS(IsMainThreadAlive()); - m_pCommunicationDevice->Cancel(m_pLcmInterface->getLCMContext()); + m_pCommunicationDevice->Cancel(m_pCommunicationDevice); //Send exit z-protocol command. VERIFY_SUCCESS(m_pZRpcFunctions->DoRPC_Z_Exit_Z_Protocol()); -- cgit v1.2.3