diff options
| author | ZoranAleksov <Zoran.Aleksov@seavus.com> | 2012-02-07 15:33:42 +0100 |
|---|---|---|
| committer | Viktor Mladenovski <viktor.mladenovski@seavus.com> | 2012-05-25 14:43:32 +0200 |
| commit | 828be7d08c886347641d8bba675993caf5a13d1a (patch) | |
| tree | 17e986bd43df9a9ebbe419bd4539bc6b1860d65c /source/LCM | |
| parent | 10184ae5b432f3dd7e014afb9a8f0ea0cd880e26 (diff) | |
Delivery must be compliant with Mac OS Lion
Porting of loader communication to Mac OS Lion
ST-Ericsson ID: 358802
ST-Ericsson FOSS-OUT ID: NA
Change-Id: I2aee1b2519cb9bfd07940bdf5a9fc55d78bba7da
Depends-On: Ic1d148824eed95ed65259fc694e52f0729045208
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/44893
Reviewed-by: QABUILD
Tested-by: Cvetko MLADENOVSKI <cvetko.mladenovski@seavus.com>
Reviewed-by: Viktor MLADENOVSKI <viktor.mladenovski@stericsson.com>
Diffstat (limited to 'source/LCM')
| -rw-r--r-- | source/LCM/Hash.cpp | 3 | ||||
| -rw-r--r-- | source/LCM/include/c_compiler.h | 2 | ||||
| -rw-r--r-- | source/LCM/include/t_basicdefinitions.h | 2 | ||||
| -rw-r--r-- | source/LCM/include/t_r15_header.h | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/source/LCM/Hash.cpp b/source/LCM/Hash.cpp index 94fb585..1b6efd5 100644 --- a/source/LCM/Hash.cpp +++ b/source/LCM/Hash.cpp @@ -78,7 +78,7 @@ void *Hash::WorkerThread(void *arg) HashRequest *request = 0; while (true) { - RemoveResult result = pThis->m_RequestQueue->RemoveHead(reinterpret_cast<void **>(&request), INFINITE); + RemoveResult result = pThis->m_RequestQueue->RemoveHead((void**)(&request), INFINITE); if (REMOVE_SUCCESS != result) { break; @@ -91,7 +91,6 @@ void *Hash::WorkerThread(void *arg) if (request->Length != 0) { SecurityAlgorithms::SHA256(request->Data_p, request->Length, request->Hash_p); } - break; case HASH_CRC16: diff --git a/source/LCM/include/c_compiler.h b/source/LCM/include/c_compiler.h index 90799b1..cac45da 100644 --- a/source/LCM/include/c_compiler.h +++ b/source/LCM/include/c_compiler.h @@ -84,7 +84,7 @@ #elif defined(__GNUC__) #ifdef __arm__ #define COMPILER_GCC_ARM -#elif defined(__linux__) +#elif (defined(__linux__) || defined(__APPLE__)) /* TARGET IS LINUX */ #define COMPILER_GCC #endif diff --git a/source/LCM/include/t_basicdefinitions.h b/source/LCM/include/t_basicdefinitions.h index 038971d..08c3560 100644 --- a/source/LCM/include/t_basicdefinitions.h +++ b/source/LCM/include/t_basicdefinitions.h @@ -75,7 +75,7 @@ #define SINT64_SUPPORTED #define UINT64_SUPPORTED #define INT64_BASE_TYPE __int64 -#elif defined(__linux__) +#elif (defined(__linux__) || defined(__APPLE__)) #define SINT64_SUPPORTED #define UINT64_SUPPORTED #define INT64_BASE_TYPE long long diff --git a/source/LCM/include/t_r15_header.h b/source/LCM/include/t_r15_header.h index f102912..e31ca8c 100644 --- a/source/LCM/include/t_r15_header.h +++ b/source/LCM/include/t_r15_header.h @@ -41,7 +41,11 @@ /** The length of the bulk extended header. */ #define BULK_EXTENDED_HEADER_LENGTH 20 /** Offset of the header in the buffer. */ +#ifndef CFG_ENABLE_LOADER_TYPE +#define HEADER_OFFSET_IN_BUFFER 0 +#else #define HEADER_OFFSET_IN_BUFFER 8 +#endif #define ALIGNED_HEADER_LENGTH ALIGN_SIZE #define ALIGNED_COMMAND_EXTENDED_HEADER_LENGTH ALIGN_SIZE |