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

7 files changed, 127 insertions, 58 deletions

diff --git a/source/LCDriver.rc b/source/LCDriver.rc
index 2a79341..5be4ef9 100644..100755
--- a/source/LCDriver.rc
+++ b/source/LCDriver.rc
@@ -81,16 +81,16 @@ BEGIN
     BEGIN

         BLOCK "000904b0"

         BEGIN

-            VALUE "Comments", "Build date: 2011-06-15"

+            VALUE "Comments", "Build date: 2011-06-16"

             VALUE "CompanyName", "STEricsson AB"

             VALUE "FileDescription", "LCDriver Dynamic Link Library"

             VALUE "FileVersion", "1, 0, 0, 1"

             VALUE "InternalName", "Loader Communication Driver"

             VALUE "LegalCopyright", "Copyright (C) STEricsson AB 2011"

             VALUE "OriginalFilename", "LCDriver_CNH1606432.dll"

-            VALUE "PrivateBuild", "http://gerrit.lud.stericsson.com/gerrit/20944"

+            VALUE "PrivateBuild", "Change-Id: Ib1901abfc2efa6c887c70b8583ddd2258e21aa78"

             VALUE "ProductName", "CXC 173 0865,  LCDriver DLL"

-            VALUE "ProductVersion", "P1M"

+            VALUE "ProductVersion", "R1N"

         END

     END

     BLOCK "VarFileInfo"

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());
diff --git a/source/LCM/include/error_codes.h b/source/LCM/include/error_codes.h
index e71d4b4..cc970cb 100644
--- a/source/LCM/include/error_codes.h
+++ b/source/LCM/include/error_codes.h
@@ -117,14 +117,28 @@ typedef enum {
     E_FAILED_TO_ALLOCATE_COMM_BUFFER = 206, /**<  Failed to allocate communication buffer. */
     E_FAILED_TO_FLUSH_RXFIFO = 207, /**<  Failed to flush RX FIFO. */
     E_RETRANSMITION_FAILED = 208, /**<  Retransmission failed. After MAX_RESENDS attempt, failed to send packet. */
-    E_COMMAND_NO_ERROR = 209, /**<   */
+    E_COMMAND_NO_ERROR = 209, /**<  Stopped command error sequence. */
     E_FAILED_TO_RELEASE_COMM_BUFFER = 210, /**<  Failed to release communication buffer. */
     E_FAILED_TO_INTIALIZE_TIMER_FUNCTIONS = 211, /**<  Failed to initialize timer functions. */
     E_FAILED_TO_INTIALIZE_QUEUE_FUNCTIONS = 212, /**<  Failed to initialize queue functions. */
+    E_DMA_INIT_ERROR = 213, /**<  Failed to initialize DMA. */
+    E_FAILED_TO_STOP_DMA = 214, /**<  Failed to stop DMA channel. */
+    E_FAILED_TO_OPEN_DMA_CHANNEL = 215, /**<  Failed to open DMA channel. */
+    E_FAILED_TO_SET_DMA_CHANNEL_TYPE = 216, /**<  Failed to set DMA channel type. */
+    E_FAILED_TO_SET_DMA_CHANNEL_MODE = 217, /**<  Failed to set DMA channel mode. */
+    E_FAILED_TO_OPEN_DMA_PIPE = 218, /**<  Failed to open DMA pipe. */
+    E_FAILED_TO_SET_DMA_IT_LOGIC = 219, /**<  Failed to set DMA interrupt logic. */
+    E_FAILED_TO_CLOSE_DMA_PIPE = 220, /**<  Failed to close DMA pipe. */
+    E_FAILED_TO_CLOSE_DMA_CHANNEL = 221, /**<  Failed to close DMA channel. */
+    E_FAILED_TO_CONFIG_SRC_DMA_DEVICE = 222, /**<  Failed to configure DMA source device. */
+    E_FAILED_TO_UPDATE_DMA_SRC_MEMORY_BUFFER = 223, /**<  Failed to update DMA source memory buffer. */
+    E_FAILED_TO_CONFIG_DEST_DMA_DEVICE = 224, /**<  Failed to configure DMA destination device. */
+    E_FAILED_TO_UPDATE_DMA_DEST_MEMORY_BUFFER = 225, /**<  Failed to update DMA destination memory buffer. */
+    E_FAILED_TO_RUN_DMA = 226, /**<  Failed to run DMA transfer. */
     E_INVALID_BULK_MODE = 251, /**<  Invalid bulk mode. */
     E_FAILED_TO_FIND_COMM_BUFFER = 252, /**<  Failed to find communication buffer. */
     E_INVALID_TYPE_OF_BUFFER = 253, /**<  Invalid type of buffer. */
-    E_COM_DEVICE_BUSY = 254, /**<   */
+    E_COM_DEVICE_BUSY = 254, /**<  Communication device is busy. */
     E_NOT_FOUND_ELEMENT_IN_RETRANSMISSION_LIST = 255, /**<  The element in retransmission list is not found. */
     E_FAILED_READING_FROM_BULK = 256, /**<  Failed to read from bulk. */
     E_FAILED_WRITING_TO_BULK = 257, /**<  Failed to write to bulk. */
@@ -144,14 +158,14 @@ typedef enum {
     E_UNREGISTER_FS_SERVICE_FAILED = 458, /**<  Unregistering of File System Manager Service failed. */
     E_UNREGISTER_FPD_SERVICE_FAILED = 459, /**<  Unregistering of Flash Physical Driver Service failed. */
     E_UNREGISTER_GD_SERVICE_FAILED = 460, /**<  Unregistering of Global Data Manager Service failed. */
-    E_GENERAL_ZIP_ERROR = 551, /**<   */
-    E_ZIP_FAILED_TO_CREATE_CONTEXT = 552, /**<   */
-    E_ZIP_FAILED_TO_OPEN_FILE = 553, /**<   */
-    E_FILESYS_APP_INIT_FAILURE = 600, /**<   */
-    E_NO_FILESYSTEM_PROPERTY = 601, /**<   */
-    E_UNDEFINED_AUTHENTICATION_TYPE = 602, /**<   */
-    E_RTC_TIME_NOT_ACCURATE = 651, /**<   */
-    E_RTC_INTIALIZATION_FAILED = 652, /**<   */
+    E_GENERAL_ZIP_ERROR = 551, /**<  General error. */
+    E_ZIP_FAILED_TO_CREATE_CONTEXT = 552, /**<   Failed to parse the zip. */
+    E_ZIP_FAILED_TO_OPEN_FILE = 553, /**<   Failed to open file from the zip. */
+    E_FILESYS_APP_INIT_FAILURE = 600, /**<  Failed to initialize the file system application. */
+    E_NO_FILESYSTEM_PROPERTY = 601, /**<  Failed to start file system. */
+    E_UNDEFINED_AUTHENTICATION_TYPE = 602, /**<  Undefined authentication type. */
+    E_RTC_TIME_NOT_ACCURATE = 651, /**<  System Time is not properly set. */
+    E_RTC_INTIALIZATION_FAILED = 652, /**<  Hardware error ocure during initialization of RTC. */
     E_DIFFERENT_FLASHLAYOUT = 751, /**<  Different flashlayout. */
     E_EMPTY_FILE_IN_ARCHIVE = 752, /**<  Archive contain empty file. */
     E_UNKNOWN_COMM_DEVICE = 753, /**<  Unknown communication device was detected. */
@@ -162,6 +176,23 @@ typedef enum {
     E_FPD_NOT_CONFIGURED = 758, /**<  Flash physical driver is not configured. */
     E_INVALID_SIZE_IN_MEMCONF = 759, /**<  MEMCONF boot record contain invalid TotalSize field. */
     E_ARCHIVE_TO_LARGE = 760, /**<  Flash archive larger than available space in BDM. */
+    E_ENTRY_NOT_FOUND_IN_FLASHLAYOUT = 761, /**<  Entry not found in flashlayout file. */
+    E_MISMATCH_MANIFEST_FLASHLAYOUT = 762, /**<  Mismatch between manifest and flashlayout. */
+    E_INVALID_SUBTOC_PARAMETERS = 763, /**<  SUBTOC is invalid. */
+    E_FAILED_TO_READ_SUBTOC = 764, /**<  Reading SUBTOC from flash failed. */
+    E_OVERLAPPING_PARTITIONS_FOUND = 765, /**<  Overlapping partitions found in the archive. */
+    E_PARTITION_NOT_FOUND = 766, /**<  Partition not found in TOC. */
+    E_FLASHLAYOUT_NULL = 767, /**<  Flashlayout data equals NULL. */
+    E_INVALID_TOC_TYPE = 768, /**<  Invalid TOC type supplied during TOC list creation. */
+    E_TOC_HANDLER_INPUT_DATA_EMPTY = 769, /**<  TOC list cannot be created because supplied buffer is empty. */
+    E_TOC_HANDLER_INPUT_DATA_CORRUPTED = 770, /**<  TOC list cannot be created because supplied buffer contains corrupted data. */
+    E_TOC_LIST_CORRUPTED = 771, /**<  TOC list cannot be created. Some malicious state occurs. */
+    E_TOC_BOOT_AREA_EMPTY = 772, /**<  TOC list cannot be created. Boot area is empty. */
+    E_BOOT_AREA_NOT_FOUND = 773, /**<  Boot Area not found. */
+    E_MISMATCH_MANIFEST_TOC = 774, /**<  Mismatch between manifest and TOC. */
+    E_FILE_TOO_LARGE = 775, /**<  File too large. */
+    E_FILE_OUT_OF_BOOT_AREA = 776, /**<  File outside of boot area */
+    E_DUMP_OUT_OF_FLASH_RANGE = 777, /**<  Dump outside of flash range */
     E_PATH_NOT_EXISTS = 951, /**<  Path not exist. */
     E_CLOSE_FILE = 952, /**<  Failed to close a file in the file system. */
     E_INSUFFICENT_SPACE = 953, /**<  Not enough memory space for desired operation. */
@@ -207,13 +238,13 @@ typedef enum {
     E_INVALID_INPUT_PARAMETER = 1001, /**<  Invalid input parameter */
     E_UNSUPPORTED_CMD = 1002, /**<  The loader does not support the requested command. */
     E_UNSUPPORTED_GROUP = 1003, /**<  The loader does not support the requested group. */
-    E_INVALID_COMMAND_SIZE = 1051, /**<   */
-    E_OVERLOAD_COMMAND_TABLE = 1052, /**<   */
-    E_COMMAND_ALREADY_REGISTERED = 1053, /**<   */
+    E_INVALID_COMMAND_SIZE = 1051, /**<  The size of the command is invalid. */
+    E_OVERLOAD_COMMAND_TABLE = 1052, /**<  Too many commands are registered. */
+    E_COMMAND_ALREADY_REGISTERED = 1053, /**<  Command has already registered in execution queue. */
     E_AUDITING_FAILED = 1054, /**<   Command auditing failed. */
-    E_NONEXIST_TIMER = 1251, /**<   */
-    E_FAILED_TO_SET_TIMER = 1252, /**<   */
-    E_TIMER_INIT_FAILED = 1253, /**<   */
+    E_NONEXIST_TIMER = 1251, /**<  Timer with the specified index does not exist. */
+    E_FAILED_TO_SET_TIMER = 1252, /**<  Failed to start the timer. */
+    E_TIMER_INIT_FAILED = 1253, /**<  Timer initialization failed. */
     E_TIMER_IRQ_CONF_FAILED = 1254, /**<   */
     E_GD_INVALID_UNIT_SIZE = 1351, /**<  GD/GDFS: Error in specifying unit size. */
     E_GD_LL_ILLEGAL_SIZE = 1352, /**<  GD/GDFS: Size too large for the block. */
@@ -247,6 +278,19 @@ typedef enum {
     E_GD_MISSING_CONFIG = 1380, /**<  GD/GDFS: Missing configuration parameter. */
     E_GD_ILLEGAL_CONFIG = 1381, /**<  GD/GDFS: Illegal configuration. */
     E_GD_TRANSACTION_LOG_CORRUPT = 1382, /**<  GD/GDFS: The transaction log used for tracking updates to GD contents is corrupt and prevents roll-back from working properly. */
+    E_CSPSA_RESULT_E_INVALID_KEY = 1383, /**<  Error, parameter key not valid. */
+    E_CSPSA_RESULT_E_OUT_OF_SPACE = 1384, /**<  Error, there is not space enough on memory media to update the parameter area. */
+    E_CSPSA_RESULT_E_NO_VALID_IMAGE = 1385, /**<  Error, no valid CSPSA image found. */
+    E_CSPSA_RESULT_E_MEDIA_INACCESSIBLE = 1386, /**<  Memory media could not be accessed. */
+    E_CSPSA_RESULT_E_READ_ONLY = 1387, /**<  Image is read-only. */
+    E_CSPSA_RESULT_E_READ_ERROR = 1388, /**<  Error occurred while reading from media. */
+    E_CSPSA_RESULT_E_WRITE_ERROR = 1389, /**<  Error occurred while writing to media. */
+    E_CSPSA_RESULT_UNDEFINED = 1390, /**<  Represents an undefined value of this enum. */
+    E_CSPSA_RESULT_E_END_OF_DATA = 1391, /**<  No more parameters, end of data has been reached. */
+    E_CSPSA_RESULT_E_OPEN_ERROR = 1392, /**<  Parameter storage area could not be opened (media error). */
+    E_CSPSA_RESULT_E_ALREADY_EXISTS = 1393, /**<  Parameter storage area with same name was already registered. */
+    E_CSPSA_RESULT_E_OUT_OF_MEMORY = 1394, /**<  There was not enough memory to perform the operation. */
+    E_CSPSA_RESULT_E_BAD_PARAMETER = 1395, /**<  Error because of bad input parameter. */
     E_GD_NO_DATA_TO_READ = 1399, /**<  GD: No data to read. */
     E_BDM_W_NO_MORE_GC_POSSIBLE = 1451, /**<  BDM: No more garbage collection is possible. */
     E_BDM_UNIT_STARTED = 1452, /**<  BDM: Unit has already been started. */
@@ -416,12 +460,12 @@ typedef enum {
     E_INT_FUNCTION_LIST_EMPTY = 2007, /**<  There isn't any interface function in interface group. */
     E_PRECONDITION_IS_ALREADY_SET = 2008, /**<  Request for setting precondition that is already set. */
     E_PRECONDITION_IS_NOT_SET = 2009, /**<  Request to recover condition that is not changed. */
-    E_INIT_OTP_PD_FAILED = 2100, /**<   */
-    E_READING_OTP_FAILED = 2101, /**<   */
-    E_WRITTING_OTP_FAILED = 2102, /**<   */
-    E_INVALID_CID_VALUE = 2103, /**<   */
-    E_INIT_OTP_LD_FAILED = 2104, /**<   */
-    E_OTP_AREA_LOCKED = 2105, /**<   */
+    E_INIT_OTP_PD_FAILED = 2100, /**<  Failed to initialize OTD driver. */
+    E_READING_OTP_FAILED = 2101, /**<  Failed to read data from OTP. */
+    E_WRITTING_OTP_FAILED = 2102, /**<  Failed to write data in OTP. */
+    E_INVALID_CID_VALUE = 2103, /**<  Trying to write invalid CID in OTP. */
+    E_INIT_OTP_LD_FAILED = 2104, /**<  Failed to initialize OTD logical driver. */
+    E_OTP_AREA_LOCKED = 2105, /**<  Requested OTP area is already locked. */
     E_SEC_APP_PROPERTY_NOT_FOUND = 2251, /**<  App property cannot be found. */
     E_SEC_APP_IMEI_NOT_CHANGABLE = 2252, /**<  IMEI not changeable. */
     E_SEC_APP_OPERATION_DENIED = 2253, /**<  Security operation denied. */
@@ -429,9 +473,9 @@ typedef enum {
     E_SEC_APP_ROM_ERROR_CRITICAL = 2255, /**<  Critical error in ROM has occurred. */
     E_SEC_APP_ROM_ERROR = 2256, /**<  Unexpected ROM error. */
     E_SEC_APP_PATCH_EXISTS = 2257, /**<  ROM Patch is already installed. */
-    E_SEC_APP_PATCH_REINSTALLED = 2258, /**<  ROM Patch in Flash is reinstalled. */
-    E_SEC_APP_ROOTKEY_EXISTS = 2259, /**<  ROM Patch is already installed. */
-    E_SEC_APP_ROOTKEY_REINSTALLED = 2260, /**<  Root Key is reinstalled. */
+    E_SEC_APP_PATCH_REINSTALLED = 2258, /**<  Operation successful. */
+    E_SEC_APP_ROOTKEY_EXISTS = 2259, /**<  RootKey is already installed. */
+    E_SEC_APP_ROOTKEY_REINSTALLED = 2260, /**<  Operation successful. */
     E_TA_WRONG_PARTITION = 2351, /**<  TA: Unknown partition. */
     E_TA_ILLOGICAL_CONFIGURATION = 2352, /**<  TA: Configuration error. */
     E_TA_UNKNOWN_MEMORY_TYPE = 2353, /**<  TA: Unsupported memory type. */
@@ -456,6 +500,28 @@ typedef enum {
     E_PD_CFI_PROTECTED = 2656, /**<  PD CFI: The requested flash address is protected from the requested type of access. */
     E_PD_CFI_UNSUPPORTED_DEVICE = 2657, /**<  PD CFI: Flash devices not supported by this driver. */
     E_PD_CFI_OPERATION_COMPLETE = 2658, /**<  PD CFI: Requested operation was not suspended as it has completed. */
+    E_PD_CFI_HARDWARE_NOT_DETECTED = 2659, /**<  PD CFI: NOR memory was not detected on current configuration. */
+    E_HSI_BSC_RESULT_FAILED = 2701, /**<  General Error. */
+    E_HSI_BSC_RESULT_FAILED_INVALIDARGS = 2702, /**<  Invalid arguments. */
+    E_HSI_BSC_RESULT_FAILED_NOTSUPPORTED = 2703, /**<  Implementation is removed. */
+    E_HSI_BSC_RESULT_FAILED_HSIERR = 2704, /**<  HSI internal error. */
+    E_HSI_BSC_RESULT_FAILED_BUSY = 2705, /**<  Communication device is busy. */
+    E_HSI_BSC_ERROR_SIGNAL = 2751, /**<  Signal error. */
+    E_HSI_BSC_ERROR_TIMEOUT = 2752, /**<  Timeout error. */
+    E_HSI_BSC_ERROR_BREAK = 2753, /**<  Break received. */
+    E_HSI_BSC_ERROR_RECEIVE = 2754, /**<  Receive buffer is not provided. */
+    E_HSI_BSC_ERROR_TRANSMIT = 2755, /**<  Transmit buffer is not provided. */
+    E_CR_INVALID_STATE = 2850, /**<  Invalid state for commnication relay detected. */
+    E_CR_NOT_RUNNING = 2851, /**<  Communication Relay is not running. */
+    E_SDIO_BSC_RESULT_FAILED = 2901, /**<  General Error. */
+    E_SDIO_BSC_RESULT_FAILED_INVALIDARGS = 2902, /**<  Invalid arguments. */
+    E_SDIO_BSC_RESULT_FAILED_NOTSUPPORTED = 2903, /**<  Implementation is removed. */
+    E_SDIO_BSC_RESULT_FAILED_SDIOERR = 2904, /**<  SDIO internal error. */
+    E_SDIO_BSC_RESULT_FAILED_BUSY = 2905, /**<  Communication device is busy. */
+    E_SDIO_BSC_ERROR_TIMEOUT = 2951, /**<  Timeout error. */
+    E_SDIO_BSC_ERROR_BREAK = 2952, /**<  Break received. */
+    E_SDIO_BSC_ERROR_RECEIVE = 2953, /**<  Receive buffer is not provided. */
+    E_SDIO_BSC_ERROR_TRANSMIT = 2954, /**<  Transmit buffer is not provided. */
     E_LOADER_SEC_LIB_CHIP_ID_INVALID = 4000, /**<  Invalid input parameters. */
     E_LOADER_SEC_LIB_INVALID_PARAMETER_TO_FUNC = 4096, /**<  Invalid input parameters. */
     E_LOADER_SEC_LIB_FAILURE = 4120, /**<  Failure. */
@@ -499,16 +565,18 @@ typedef enum {
     E_LOADER_SEC_LIB_BOOT_BLOCK_DO_NOT_EXIST = 4212, /**<  Boot record do not exist. */
     E_LOADER_SEC_LIB_CORRUPTED_DOMAIN_DATA = 4213, /**<  Corrupted or do not exist domain data in boot block. */
     E_LOADER_SEC_LIB_INVALID_DOMAIN = 4214, /**<  Invalid domain. */
-    E_FIFO_OVERFLOW = 4300, /**<   */
-    E_FIFO_UNDERFLOW = 4301, /**<   */
-    E_OBJECT_NULL = 4302, /**<   */
-    E_POINTER_NOT_NULL = 4303, /**<   */
-    E_UNRECOGNIZED_STATE = 4304, /**<   */
-    E_UNKNOWN_MANUFACTURER_ID = 4305, /**<   */
-    E_UNKNOWN_DEVICE_ID = 4306, /**<   */
-    E_INVALID_A01_FORMAT = 4308, /**<   */
-    E_A01_BUFFER_FULL = 4309, /**<   */
-    E_CONFIG_FILE_NOT_SPECIFIED = 4350, /**<   */
+    E_LOADER_SEC_LIB_INVALID_CHALLENGE_DATA_BLOCK = 4215, /**<  Invalid challenge data block. */
+    E_LOADER_SEC_LIB_NO_DEBUG_HW_NOT_ALLOWED = 4216, /**<  Not allowed operation on NoDebug HW. */
+    E_FIFO_OVERFLOW = 4300, /**<  UART FIFO overflow. */
+    E_FIFO_UNDERFLOW = 4301, /**<  UART FIFO underflow. */
+    E_OBJECT_NULL = 4302, /**<  Null pointer to Object. */
+    E_POINTER_NOT_NULL = 4303, /**<  Pointer is not NULL. */
+    E_UNRECOGNIZED_STATE = 4304, /**<  The state in the State Machine is invalid. */
+    E_UNKNOWN_MANUFACTURER_ID = 4305, /**<  The provided manufacturer ID is not valid. */
+    E_UNKNOWN_DEVICE_ID = 4306, /**<  The provided device ID is not valid. */
+    E_INVALID_A01_FORMAT = 4308, /**<  Something wrong with the A01 file containing the flash image. */
+    E_A01_BUFFER_FULL = 4309, /**<  Buffer holding the data from the A01 file is full. */
+    E_CONFIG_FILE_NOT_SPECIFIED = 4350, /**<  Configuration file for the emulator is not specified. */
     A2_E_SUCCESS = 5000, /**<  Operation successful. */
     A2_E_PROP_NOT_SUPPORTED = 5001, /**<  The property is not supported. */
     A2_E_PROP_READ_ONLY = 5002, /**<  The property is read only. */
diff --git a/source/LCM/include/t_communication_service.h b/source/LCM/include/t_communication_service.h
index 3b686cc..74f4721 100644
--- a/source/LCM/include/t_communication_service.h
+++ b/source/LCM/include/t_communication_service.h
@@ -44,7 +44,7 @@ typedef enum {
 
 typedef void (*CommunicationCallback_t)(const void *Data_p, const uint32 Length, void *Param_p);
 typedef void (*HashCallback_t)(void *Data_p, const uint32 Length, uint8 *Hash_p, void *Param_p);
-typedef boolean(*DeviceRead_fn)(void *Data_p, uint32 Length, CommunicationCallback_t Callback_fn, void *Param_p);
+typedef ErrorCode_e(*DeviceRead_fn)(void *Data_p, uint32 Length, CommunicationCallback_t Callback_fn, void *Param_p);
 typedef ErrorCode_e(*DeviceWrite_fn)(void *Data_p, uint32 Length, CommunicationCallback_t Callback_fn, void *Param_p);
 typedef ErrorCode_e(*DeviceCancel_fn)(void *Param_p);
 typedef void (*HashDeviceCancel_fn)(void *Object_p, void **Param_p);
@@ -122,8 +122,8 @@ typedef struct {
                                           defined timer. */
     ReadTime_t      ReadTime_Fn;       /**< Pointer to function for read time from
                                           specified timer. */
-    GetSystemTime_t GetSystemTime_Fn;  /**< Pointer to function for read curent
-                                          sytem time. */
+    GetSystemTime_t GetSystemTime_Fn;  /**< Pointer to function for read current
+                                          system time. */
     void           *Object_p;          /**< Pointer for instancing. It is used in
                                           the PC application, but in the loaders
                                           is always NULL */
@@ -165,7 +165,7 @@ typedef struct {
                                                           then all interrupt
                                                           enabled. */
     RFifoDestroy_t          RFifoDestroy_Fn;           /**< Pointer to function
-                                                          for Fifo destroing.
+                                                          for Fifo destroying.
                                                           First all interrupts
                                                           are disabled,
                                                           function executed and
@@ -219,9 +219,9 @@ typedef struct {
                                                           executed and then all
                                                           interrupt enabled. */
     void                   *Object_p;                  /**<Pointer for instancing.
-                                                         It is used in the PC
-                                                         application, but in the
-                                                         loaders is always NULL.*/
+                                                          It is used in the PC
+                                                          application, but in the
+                                                          loaders is always NULL.*/
 } QueueInterface_t;
 
 /**
@@ -247,9 +247,10 @@ typedef struct {
                                    communication device. */
     DeviceWrite_fn  Write;      /**< Pointer to function for write data thru the
                                    communication device. */
-    DeviceCancel_fn Cancel;     /**< Pointer to function for caneling current
-                                   communcation with communiation device. */
+    DeviceCancel_fn Cancel;     /**< Pointer to function for canceling current
+                                   communication with communication device. */
     void           *Context_p;  /**< Pointer to Device description data. */
+    void           *Object_p;   /**< Pointer to Object associated with the device. */
 } CommunicationDevice_t;
 
 /**
@@ -288,7 +289,7 @@ typedef struct ExecutionContext_s {
 /** Communication context.*/
 typedef struct {
     void                      *Inbound_p;            /**< Pointer to structure for
-                                                        handling incomming
+                                                        handling incoming
                                                         packets.*/
     void                      *Outbound_p;           /**< Pointer to structure for
                                                         handling outgoing
@@ -309,7 +310,7 @@ typedef struct {
     FunctionInterface_t       *Functions_p;          /**< Pointer to interface
                                                         functions for buffers,
                                                         timers and queue.*/
-    Do_CEH_Call_t             Do_CEH_Call_Fn;        /**< Pointer to calback
+    Do_CEH_Call_t             Do_CEH_Call_Fn;        /**< Pointer to callback
                                                         function for handling
                                                         commands received thru
                                                         the LCM.*/
@@ -329,7 +330,7 @@ typedef struct FamilyDescriptor_s {
     ErrorCode_e(*FamilyInit_fn)(Communication_t *Communication_p);
     /**< Pointer to Interface function for protocol family de-initialization. */
     ErrorCode_e(*FamilyShutdown_fn)(Communication_t *Communication_p);
-    /**< Pointer to Pooling function in curren protocol family. */
+    /**< Pointer to Pooling function in current protocol family. */
     ErrorCode_e(*Process_fn)(Communication_t *Communication_p);
     /**< Pointer to function for sending packets.*/
     ErrorCode_e(*Send_fn)(Communication_t *Communication_p, void *InputData_p);
diff --git a/source/LCM/include/t_protrom_network.h b/source/LCM/include/t_protrom_network.h
index 955b589..b29a65a 100644
--- a/source/LCM/include/t_protrom_network.h
+++ b/source/LCM/include/t_protrom_network.h
@@ -34,7 +34,7 @@ typedef enum {
     PROTROM_RECEIVE_HEADER,   /**< State for receiving Header.*/
     PROTROM_RECEIVE_PAYLOAD,  /**< State for receiving Payload.*/
     PROTROM_RECEIVE_ERROR,    /**< State for error handling.*/
-    PROTROM_RECEIVE_IDLE      /**< State for receiver idele.*/
+    PROTROM_RECEIVE_IDLE      /**< State for receiver idle.*/
 } Protrom_InboundState_t;
 
 /** Defined state of the transmitter */
diff --git a/source/LCM/include/t_r15_network_layer.h b/source/LCM/include/t_r15_network_layer.h
index 5e78ddd..3d48957 100644
--- a/source/LCM/include/t_r15_network_layer.h
+++ b/source/LCM/include/t_r15_network_layer.h
@@ -286,13 +286,13 @@ typedef struct {
     PacketMeta_t            *MetaInfoList[COMMAND_BUFFER_COUNT+BULK_BUFFER_COUNT];
     /**< List of meta data for used packets. */
     RetransmissionContext_t *RetransmissionList[MAX_SIZE_RETRANSMISSION_LIST];
-    /**< List of packet for retransmision */
+    /**< List of packet for retransmission */
     uint32                   RetransmissionListCount;
-    /**< Counter for packets retransmision */
+    /**< Counter for packets retransmission */
     R15_Inbound_t            Inbound;
     /**< Context for receiver. */
     R15_Outbound_t           Outbound;
-    /**< Context for transmiter. */
+    /**< Context for transmitter. */
 } R15_NetworkContext_t;
 
 /*
diff --git a/source/resource.h b/source/resource.h
index eb45504..3c3fe90 100644
--- a/source/resource.h
+++ b/source/resource.h
@@ -4,7 +4,7 @@
 //
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        101