diff options
| author | xmarvla <vlatko.markovic@seavus.com> | 2011-06-16 14:45:38 +0100 |
|---|---|---|
| committer | Viktor Mladenovski <viktor.mladenovski@seavus.com> | 2011-08-17 22:10:43 +0200 |
| commit | b9b4df06ddb81a6d14354fc0d42e22acf0b4c30c (patch) | |
| tree | 48b17930f3f28c72094f090ba38e6761aa43416b /source/LCDriverMethods.cpp | |
| parent | c9d1f9613e3ac18d5dd3b9432646e289bb88cec9 (diff) | |
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 <cvetko.mladenovski@seavus.com>
Tested-by: Aleksandar GASOSKI <aleksandar.gasoski@seavus.com>
Reviewed-by: Zoran ANCEVSKI <zoran.ancevski@seavus.com>
Reviewed-by: QATEST
Reviewed-by: Vlatko PISTOLOV <vlatko.pistolov@seavus.com>
Conflicts:
lcmodule/win_binaries/LCM.dll
win_binaries/LCDriver_CNH1606432.dll
Diffstat (limited to 'source/LCDriverMethods.cpp')
| -rw-r--r-- | source/LCDriverMethods.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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()); |