diff options
| author | Slobodanka Shopova <slobodanka.shopova@seavus.com> | 2012-01-17 14:57:47 +0100 |
|---|---|---|
| committer | Viktor Mladenovski <viktor.mladenovski@seavus.com> | 2012-05-25 14:42:15 +0200 |
| commit | 1f19de4d7fe07671dfa91961a8e562124a734528 (patch) | |
| tree | 7118e7372f5dd0350b5511a45afa8ed03be1f5aa | |
| parent | e80c74d2b26a3ac5e8fc818d749fdcf60181d101 (diff) | |
Update LCM error codes
Error codes sync and revision number update.
ST-Ericsson ID: 410305
ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10204
Change-Id: I44e97085602e2005cbfbe1c350f243b2ace856c4
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/45463
Reviewed-by: Vlatko PISTOLOV <vlatko.pistolov@seavus.com>
Tested-by: Vlatko PISTOLOV <vlatko.pistolov@seavus.com>
| -rw-r--r-- | lcmodule/source/LCM.rc | 12 | ||||
| -rw-r--r-- | lcmodule/source/cnh1606344_ldr_communication_module/source/lcm_version.c | 2 | ||||
| -rw-r--r-- | source/LCDriver.rc | 18 | ||||
| -rw-r--r-- | source/LcdVersion.cpp | 2 |
4 files changed, 20 insertions, 14 deletions
diff --git a/lcmodule/source/LCM.rc b/lcmodule/source/LCM.rc index 279a74c..c8c4b36 100644 --- a/lcmodule/source/LCM.rc +++ b/lcmodule/source/LCM.rc @@ -13,11 +13,13 @@ #undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// English (United States) resources
+// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
+#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@@ -67,15 +69,15 @@ BEGIN BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "Build date: 2012-01-04"
+ VALUE "Comments", "Build date: 2012-01-17"
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 "PrivateBuild", "Change-Id: Ic8d9b0940cc9c949aac84cea8abca4f95c992a93"
+ VALUE "PrivateBuild", "Change-Id: I44e97085602e2005cbfbe1c350f243b2ace856c4"
VALUE "ProductName", "CXA1104507 Loader Communication Module"
- VALUE "ProductVersion", "PX5"
+ VALUE "ProductVersion", "R1X"
END
END
BLOCK "VarFileInfo"
@@ -84,7 +86,7 @@ BEGIN END
END
-#endif // English (United States) resources
+#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
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 2d76970..6cc980b 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[] = "PX5"; +char LCM_CurrentVersion[] = "R1X"; /** @} */ diff --git a/source/LCDriver.rc b/source/LCDriver.rc index c7827e5..a344099 100644 --- a/source/LCDriver.rc +++ b/source/LCDriver.rc @@ -13,11 +13,13 @@ #undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// English (United States) resources
+// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
+#endif //_WIN32
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@@ -44,16 +46,18 @@ END #endif // APSTUDIO_INVOKED
-#endif // English (United States) resources
+#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// English (United Kingdom) resources
+// English (U.K.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
+#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
#pragma code_page(1252)
+#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
@@ -77,15 +81,15 @@ BEGIN BEGIN
BLOCK "000904b0"
BEGIN
- VALUE "Comments", "Build date: 2012-01-04"
+ VALUE "Comments", "Build date: 2012-01-17"
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 "PrivateBuild", "Change-Id: Ic8d9b0940cc9c949aac84cea8abca4f95c992a93"
+ VALUE "PrivateBuild", "Change-Id: I44e97085602e2005cbfbe1c350f243b2ace856c4"
VALUE "ProductName", "CXC 173 0865, LCDriver DLL"
- VALUE "ProductVersion", "PU5"
+ VALUE "ProductVersion", "R1X"
END
END
BLOCK "VarFileInfo"
@@ -94,7 +98,7 @@ BEGIN END
END
-#endif // English (United Kingdom) resources
+#endif // English (U.K.) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/source/LcdVersion.cpp b/source/LcdVersion.cpp index a1b9dcc..2db011b 100644 --- a/source/LcdVersion.cpp +++ b/source/LcdVersion.cpp @@ -18,6 +18,6 @@ * This table contains compatibility information for the versions of LCM. * Current LCM version is defined in file lcm_version.c in LCM code. */ -char *LCD_LCM_CompatibilityList[] = {"PX5", +char *LCD_LCM_CompatibilityList[] = {"R1X", NULL }; |