change a readable way to fix SB800 CIMX "multi-character constant warning".

by using 'Int32FromChar' macro, instead of the ASCII code.

Signed-off-by: Kerry She <kerry.she@amd.com>
Acked-by: Marc Jones <marcj303@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6248 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/southbridge/amd/cimx_wrapper/sb800/Amd.h b/src/southbridge/amd/cimx_wrapper/sb800/Amd.h
index ee140d4adfb919d135947ec2a73f94f560c0f79d..93a623405910320f7a3294a84eb4f8b051dfe5fa 100644 (file)
--- a/src/southbridge/amd/cimx_wrapper/sb800/Amd.h
+++ b/src/southbridge/amd/cimx_wrapper/sb800/Amd.h
@@ -49,7 +49,15 @@
 #define IOCFC 0xCFC
 #define IN
 #define OUT
-#define IMAGE_SIGNATURE 'DMA$'
+
+#ifndef Int16FromChar
+#define Int16FromChar(a,b) ((a) << 0 | (b) << 8)
+#endif
+#ifndef Int32FromChar
+#define Int32FromChar(a,b,c,d) ((a) << 0 | (b) << 8 | (c) << 16 | (d) << 24)
+#endif
+
+#define IMAGE_SIGNATURE     Int32FromChar ('$', 'A', 'M', 'D')
 
 typedef UINTN AGESA_STATUS;
 

diff --git a/src/vendorcode/amd/cimx/sb800/ACPILIB.c b/src/vendorcode/amd/cimx/sb800/ACPILIB.c
index 377167325799aa15125cc4f86088a1dca5c6ba83..2544726aa831a4a4b6d8646f72995653e828565d 100644 (file)
--- a/src/vendorcode/amd/cimx/sb800/ACPILIB.c
+++ b/src/vendorcode/amd/cimx/sb800/ACPILIB.c
@@ -52,9 +52,7 @@ ACPI_LocateTable (
   RsdPtr = (UINT32*) (UINTN)0xe0000;\r
   Rsdt = NULL;\r
   do {\r
-    //if ( *RsdPtr == ' DSR' && *(RsdPtr + 1) == ' RTP' ) { //gcc multi-character character constant warning\r
-    if ( *RsdPtr == 0x20445352 && *(RsdPtr + 1) == 0x20525450) {\r
-\r
+    if ( *RsdPtr == Int32FromChar('R', 'S', 'D', ' ') && *(RsdPtr + 1) == Int32FromChar('P', 'T', 'R', ' ')) {\r
       Rsdt = (UINT32*) (UINTN) ((RSDP*)RsdPtr)->RsdtAddress;\r
       break;\r
     }\r

diff --git a/src/vendorcode/amd/cimx/sb800/DISPATCHER.c b/src/vendorcode/amd/cimx/sb800/DISPATCHER.c
index 5e3f5ca7e7b1e538fb17e1aa5880cfd162cb6759..61c57cafa075102136d2403edb2b0c8bf7643223 100644 (file)
--- a/src/vendorcode/amd/cimx/sb800/DISPATCHER.c
+++ b/src/vendorcode/amd/cimx/sb800/DISPATCHER.c
@@ -204,8 +204,7 @@ VerifyImage (
   UINT16 Sum;\r
   UINT32  i;\r
   Sum = 0;\r
-  //if ( (*((UINT32*)ImagePtr) == 'DMA$' && ((CIMFILEHEADER*)ImagePtr)->CreatorID == Signature) ) { //gcc multi-character character constant warning\r
-  if ( (*((UINT32*)ImagePtr) == 0x444d4124 && ((CIMFILEHEADER*)ImagePtr)->CreatorID == Signature) ) {//'DMA$'\r
+  if ( (*((UINT32*)ImagePtr) == Int32FromChar('$', 'A', 'M', 'D') && ((CIMFILEHEADER*)ImagePtr)->CreatorID == Signature) ) {\r
     //GetImage Image size\r
     TempImagePtr = (UINT16*)ImagePtr;\r
     for ( i = 0; i < (((CIMFILEHEADER*)ImagePtr)->ImageSize); i += 2 ) {\r

diff --git a/src/vendorcode/amd/cimx/sb800/SBCMN.c b/src/vendorcode/amd/cimx/sb800/SBCMN.c
index a596036d692809fffccfbc958265934d4df4f4fd..f4851696723f9c6fa4a93e0b59624195d61a3960 100644 (file)
--- a/src/vendorcode/amd/cimx/sb800/SBCMN.c
+++ b/src/vendorcode/amd/cimx/sb800/SBCMN.c
@@ -769,12 +769,10 @@ hpetInit (
 \r
   } else {\r
     if ( ! (pConfig->S3Resume) ) {\r
-      //pHpetTable = (DESCRIPTION_HEADER*) ACPI_LocateTable ('TEPH'); //gcc multi-character character constant warning\r
-      pHpetTable = (DESCRIPTION_HEADER*) ACPI_LocateTable (0x54455048);//'TEPH'\r
+      pHpetTable = (DESCRIPTION_HEADER*) ACPI_LocateTable (Int32FromChar('H', 'P', 'E', 'T'));\r
     }\r
     if ( pHpetTable != NULL ) {\r
-      //pHpetTable->Signature = 'HPET';\r
-      pHpetTable->Signature = 0x48504554; //'HPET'\r
+      pHpetTable->Signature = Int32FromChar('T', 'E', 'P', 'H');\r
     }\r
   }\r
 }\r