From 09e0e9a68b589e1a23758e70dbee32cc4e4a2e5d Mon Sep 17 00:00:00 2001 From: Kerry She Date: Tue, 11 Jan 2011 02:15:57 +0000 Subject: 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 Acked-by: Marc Jones git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6248 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/vendorcode/amd/cimx/sb800/ACPILIB.c | 4 +--- src/vendorcode/amd/cimx/sb800/DISPATCHER.c | 3 +-- src/vendorcode/amd/cimx/sb800/SBCMN.c | 6 ++---- 3 files changed, 4 insertions(+), 9 deletions(-) (limited to 'src/vendorcode/amd/cimx') diff --git a/src/vendorcode/amd/cimx/sb800/ACPILIB.c b/src/vendorcode/amd/cimx/sb800/ACPILIB.c index 3771673257..2544726aa8 100644 --- 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; Rsdt = NULL; do { - //if ( *RsdPtr == ' DSR' && *(RsdPtr + 1) == ' RTP' ) { //gcc multi-character character constant warning - if ( *RsdPtr == 0x20445352 && *(RsdPtr + 1) == 0x20525450) { - + if ( *RsdPtr == Int32FromChar('R', 'S', 'D', ' ') && *(RsdPtr + 1) == Int32FromChar('P', 'T', 'R', ' ')) { Rsdt = (UINT32*) (UINTN) ((RSDP*)RsdPtr)->RsdtAddress; break; } diff --git a/src/vendorcode/amd/cimx/sb800/DISPATCHER.c b/src/vendorcode/amd/cimx/sb800/DISPATCHER.c index 5e3f5ca7e7..61c57cafa0 100644 --- a/src/vendorcode/amd/cimx/sb800/DISPATCHER.c +++ b/src/vendorcode/amd/cimx/sb800/DISPATCHER.c @@ -204,8 +204,7 @@ VerifyImage ( UINT16 Sum; UINT32 i; Sum = 0; - //if ( (*((UINT32*)ImagePtr) == 'DMA$' && ((CIMFILEHEADER*)ImagePtr)->CreatorID == Signature) ) { //gcc multi-character character constant warning - if ( (*((UINT32*)ImagePtr) == 0x444d4124 && ((CIMFILEHEADER*)ImagePtr)->CreatorID == Signature) ) {//'DMA$' + if ( (*((UINT32*)ImagePtr) == Int32FromChar('$', 'A', 'M', 'D') && ((CIMFILEHEADER*)ImagePtr)->CreatorID == Signature) ) { //GetImage Image size TempImagePtr = (UINT16*)ImagePtr; for ( i = 0; i < (((CIMFILEHEADER*)ImagePtr)->ImageSize); i += 2 ) { diff --git a/src/vendorcode/amd/cimx/sb800/SBCMN.c b/src/vendorcode/amd/cimx/sb800/SBCMN.c index a596036d69..f485169672 100644 --- a/src/vendorcode/amd/cimx/sb800/SBCMN.c +++ b/src/vendorcode/amd/cimx/sb800/SBCMN.c @@ -769,12 +769,10 @@ hpetInit ( } else { if ( ! (pConfig->S3Resume) ) { - //pHpetTable = (DESCRIPTION_HEADER*) ACPI_LocateTable ('TEPH'); //gcc multi-character character constant warning - pHpetTable = (DESCRIPTION_HEADER*) ACPI_LocateTable (0x54455048);//'TEPH' + pHpetTable = (DESCRIPTION_HEADER*) ACPI_LocateTable (Int32FromChar('H', 'P', 'E', 'T')); } if ( pHpetTable != NULL ) { - //pHpetTable->Signature = 'HPET'; - pHpetTable->Signature = 0x48504554; //'HPET' + pHpetTable->Signature = Int32FromChar('T', 'E', 'P', 'H'); } } } -- cgit v1.2.3