summaryrefslogtreecommitdiff
path: root/lcmodule/source
diff options
context:
space:
mode:
Diffstat (limited to 'lcmodule/source')
-rw-r--r--lcmodule/source/LCM.rc6
-rw-r--r--lcmodule/source/cnh1605204_ldr_transport_layer/include/r_a2_protocol.h2
-rwxr-xr-xlcmodule/source/cnh1605204_ldr_transport_layer/include/r_a2_speedflash.h2
-rw-r--r--lcmodule/source/cnh1605204_ldr_transport_layer/include/r_bulk_protocol.h2
-rw-r--r--lcmodule/source/cnh1605204_ldr_transport_layer/include/r_command_protocol.h2
-rw-r--r--lcmodule/source/cnh1605205_ldr_network_layer/include/t_r15_header.h4
-rw-r--r--lcmodule/source/cnh1605551_ldr_utilities/include/r_debug_macro.h2
-rw-r--r--lcmodule/source/cnh1606344_ldr_communication_module/include/r_communication_service.h2
-rw-r--r--lcmodule/source/cnh1606344_ldr_communication_module/source/lcm_version.c2
-rw-r--r--lcmodule/source/legacy_compatibility/c_compiler.h2
-rw-r--r--lcmodule/source/serialization.c1
11 files changed, 15 insertions, 12 deletions
diff --git a/lcmodule/source/LCM.rc b/lcmodule/source/LCM.rc
index f943863..0993ba4 100644
--- a/lcmodule/source/LCM.rc
+++ b/lcmodule/source/LCM.rc
@@ -69,15 +69,15 @@ BEGIN
BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "Build date: 2012-01-25"
+ VALUE "Comments", "Build date: 2012-02-07"
VALUE "CompanyName", "STEricsson AB"
VALUE "FileDescription", "LCM Dynamic Link Library"
VALUE "FileVersion", "1, 0, 0, 1"
VALUE "InternalName", "Loader Communication Module"
- VALUE "LegalCopyright", "Copyright (C) STEricsson AB 2011"
+ VALUE "LegalCopyright", "Copyright (C) STEricsson AB 2012"
VALUE "PrivateBuild", "Change-Id: I70835353a592d1f1ad40743640a1d0827e56fd2e"
VALUE "ProductName", "CXA1104507 Loader Communication Module"
- VALUE "ProductVersion", "P2Y"
+ VALUE "ProductVersion", "P3Y"
END
END
BLOCK "VarFileInfo"
diff --git a/lcmodule/source/cnh1605204_ldr_transport_layer/include/r_a2_protocol.h b/lcmodule/source/cnh1605204_ldr_transport_layer/include/r_a2_protocol.h
index fc453c2..df59efd 100644
--- a/lcmodule/source/cnh1605204_ldr_transport_layer/include/r_a2_protocol.h
+++ b/lcmodule/source/cnh1605204_ldr_transport_layer/include/r_a2_protocol.h
@@ -31,7 +31,7 @@
#define LCM_API __declspec(dllimport) // import DLL information
#endif // LCM_EXPORTS
-#elif defined(__linux__)
+#elif (defined(__linux__) || defined(__APPLE__))
#ifdef LCM_EXPORTS
#define LCM_API __attribute__((visibility("default")))
diff --git a/lcmodule/source/cnh1605204_ldr_transport_layer/include/r_a2_speedflash.h b/lcmodule/source/cnh1605204_ldr_transport_layer/include/r_a2_speedflash.h
index b36b5f0..525232f 100755
--- a/lcmodule/source/cnh1605204_ldr_transport_layer/include/r_a2_speedflash.h
+++ b/lcmodule/source/cnh1605204_ldr_transport_layer/include/r_a2_speedflash.h
@@ -29,7 +29,7 @@
#define LCM_API __declspec(dllimport) // import DLL information
#endif // LCM_EXPORTS
-#elif defined(__linux__)
+#elif (defined(__linux__) || defined(__APPLE__))
#ifdef LCM_EXPORTS
#define LCM_API __attribute__((visibility("default")))
diff --git a/lcmodule/source/cnh1605204_ldr_transport_layer/include/r_bulk_protocol.h b/lcmodule/source/cnh1605204_ldr_transport_layer/include/r_bulk_protocol.h
index 303161d..fa3f4ee 100644
--- a/lcmodule/source/cnh1605204_ldr_transport_layer/include/r_bulk_protocol.h
+++ b/lcmodule/source/cnh1605204_ldr_transport_layer/include/r_bulk_protocol.h
@@ -37,7 +37,7 @@
#define LCM_API __declspec(dllimport) // import DLL information
#endif // LCM_EXPORTS
-#elif defined(__linux__)
+#elif (defined(__linux__) || defined(__APPLE__))
#ifdef LCM_EXPORTS
#define LCM_API __attribute__((visibility("default")))
diff --git a/lcmodule/source/cnh1605204_ldr_transport_layer/include/r_command_protocol.h b/lcmodule/source/cnh1605204_ldr_transport_layer/include/r_command_protocol.h
index dce0711..d93fb9e 100644
--- a/lcmodule/source/cnh1605204_ldr_transport_layer/include/r_command_protocol.h
+++ b/lcmodule/source/cnh1605204_ldr_transport_layer/include/r_command_protocol.h
@@ -32,7 +32,7 @@
#define LCM_API __declspec(dllimport) // import DLL information
#endif // LCM_EXPORTS
-#elif defined(__linux__)
+#elif (defined(__linux__) || defined(__APPLE__))
#ifdef LCM_EXPORTS
#define LCM_API __attribute__((visibility("default")))
diff --git a/lcmodule/source/cnh1605205_ldr_network_layer/include/t_r15_header.h b/lcmodule/source/cnh1605205_ldr_network_layer/include/t_r15_header.h
index f102912..e31ca8c 100644
--- a/lcmodule/source/cnh1605205_ldr_network_layer/include/t_r15_header.h
+++ b/lcmodule/source/cnh1605205_ldr_network_layer/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
diff --git a/lcmodule/source/cnh1605551_ldr_utilities/include/r_debug_macro.h b/lcmodule/source/cnh1605551_ldr_utilities/include/r_debug_macro.h
index 4faf681..adbcad3 100644
--- a/lcmodule/source/cnh1605551_ldr_utilities/include/r_debug_macro.h
+++ b/lcmodule/source/cnh1605551_ldr_utilities/include/r_debug_macro.h
@@ -36,7 +36,7 @@
/*******************************************************************************
* Macro for disabling ARM interrupts. Do nothing for Windows and LINT target.
******************************************************************************/
-#if (defined(WIN32) || defined(CFG_ENABLE_LINT_TARGET_BUILD) || defined(__linux__) || defined(__CYGWIN__))
+#if (defined(WIN32) || defined(CFG_ENABLE_LINT_TARGET_BUILD) || defined(__linux__) || defined(__APPLE__) || defined(__CYGWIN__))
#define INT_DISABLE()
#else
#ifdef MACH_TYPE_DB5700
diff --git a/lcmodule/source/cnh1606344_ldr_communication_module/include/r_communication_service.h b/lcmodule/source/cnh1606344_ldr_communication_module/include/r_communication_service.h
index 6d88855..643e067 100644
--- a/lcmodule/source/cnh1606344_ldr_communication_module/include/r_communication_service.h
+++ b/lcmodule/source/cnh1606344_ldr_communication_module/include/r_communication_service.h
@@ -31,7 +31,7 @@
#define LCM_API __declspec(dllimport) // import DLL information
#endif // LCM_EXPORTS
-#elif defined(__linux__)
+#elif (defined(__linux__) || defined(__APPLE__))
#ifdef LCM_EXPORTS
#define LCM_API __attribute__((visibility("default")))
diff --git a/lcmodule/source/cnh1606344_ldr_communication_module/source/lcm_version.c b/lcmodule/source/cnh1606344_ldr_communication_module/source/lcm_version.c
index d1243f6..ef324cf 100644
--- a/lcmodule/source/cnh1606344_ldr_communication_module/source/lcm_version.c
+++ b/lcmodule/source/cnh1606344_ldr_communication_module/source/lcm_version.c
@@ -13,6 +13,6 @@
* LCD_LCM_CompatibilityList in file LcdVersion.cpp in LCD code.
*/
-char LCM_CurrentVersion[] = "P2Y";
+char LCM_CurrentVersion[] = "P3Y";
/** @} */
diff --git a/lcmodule/source/legacy_compatibility/c_compiler.h b/lcmodule/source/legacy_compatibility/c_compiler.h
index 90799b1..cac45da 100644
--- a/lcmodule/source/legacy_compatibility/c_compiler.h
+++ b/lcmodule/source/legacy_compatibility/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/lcmodule/source/serialization.c b/lcmodule/source/serialization.c
index 717f847..59725db 100644
--- a/lcmodule/source/serialization.c
+++ b/lcmodule/source/serialization.c
@@ -16,7 +16,6 @@
#include <string.h>
#include <stdlib.h>
#include "r_debug_macro.h"
-
/*******************************************************************************
* Definition of external functions
******************************************************************************/
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-20 15:26:29 +0000