Fix some errors detected by the GCC 4.4 compiler.

[mirror_edk2.git] / AppPkg / Applications / Sockets / WebServer / ACPI.c

diff --git a/AppPkg/Applications/Sockets/WebServer/ACPI.c b/AppPkg/Applications/Sockets/WebServer/ACPI.c
index bcb56d0ded9e38dcc9038e74f4cc8fd49c884e3e..18321d2b1289145a06d4b9efa07fab30b87b47da 100644 (file)
--- a/AppPkg/Applications/Sockets/WebServer/ACPI.c
+++ b/AppPkg/Applications/Sockets/WebServer/ACPI.c
@@ -28,7 +28,9 @@ Intel Corporation.
 #include <IndustryStandard/Acpi10.h>\r
 #include <IndustryStandard/Acpi30.h>\r
 \r
+#if defined(_MSC_VER)   //  Handle Microsoft VC++ compiler specifics.\r
 #pragma warning ( disable : 4305 )\r
+#endif  //  defined(_MSC_VER)\r
 \r
 //\r
 // Ensure proper structure formats\r
@@ -106,19 +108,19 @@ typedef struct {
   UINT16 IapcBootArch;        //  109\r
   UINT8 Reserved2;            //  111\r
   UINT32 Flags;               //  112\r
-  UINT32 ResetReg [3];        //  116\r
+  UINT32 ResetReg[3];         //  116\r
   UINT8 ResetValue;           //  128\r
-  UINT8 Reserved3 [3];        //  129\r
+  UINT8 Reserved3[3];         //  129\r
   UINT64 XFirmwareCtrl;       //  132\r
   UINT64 XDsdt;               //  140\r
-  UINT32 XPm1aEvtBlk [3];     //  148\r
-  UINT32 XPm1bEvtBlk [3];     //  160\r
-  UINT32 XPm1aCntBlk [3];     //  172\r
-  UINT32 XPm1bCntBlk [3];     //  184\r
-  UINT32 XPm2CntBlk [3];      //  196\r
-  UINT32 XPmTmrBlk [3];       //  208\r
-  UINT32 XGpe0Blk [3];        //  220\r
-  UINT32 XGpe1Blk [3];        //  232\r
+  UINT32 XPm1aEvtBlk[3];      //  148\r
+  UINT32 XPm1bEvtBlk[3];      //  160\r
+  UINT32 XPm1aCntBlk[3];      //  172\r
+  UINT32 XPm1bCntBlk[3];      //  184\r
+  UINT32 XPm2CntBlk[3];       //  196\r
+  UINT32 XPmTmrBlk[3];        //  208\r
+  UINT32 XGpe0Blk[3];         //  220\r
+  UINT32 XGpe1Blk[3];         //  232\r
 } ACPI_FADT;\r
 \r
 \r
@@ -146,7 +148,7 @@ typedef struct {
 } TABLE_SIGNATURE;\r
 \r
 \r
-CONST TABLE_SIGNATURE mTableId [] = {\r
+CONST TABLE_SIGNATURE mTableId[] = {\r
   { DSDT_SIGNATURE, "DSDT", PAGE_ACPI_DSDT },\r
   { FADT_SIGNATURE, "FADT", PAGE_ACPI_FADT }\r
 };\r
@@ -240,8 +242,8 @@ LocateTable (
     //\r
     //  Walk the list of entries\r
     //\r
-    pEntry = &pRsdt->Entry [ 0 ];\r
-    pEnd = &pEntry [(( pRsdt->Length - sizeof ( *pRsdt )) >> 2 ) + 1 ];\r
+    pEntry = &pRsdt->Entry[ 0 ];\r
+    pEnd = &pEntry[(( pRsdt->Length - sizeof ( *pRsdt )) >> 2 ) + 1 ];\r
     while ( pEnd > pEntry ) {\r
       //\r
       //  The entry is actually a 32-bit physical table address\r
@@ -324,7 +326,7 @@ RowAnsiArray (
     //  Display the characters\r
     //\r
     pData = pChar;\r
-    pEnd = &pChar [ Length ];\r
+    pEnd = &pChar[ Length ];\r
     while ( pEnd > pData ) {\r
       Status = HttpSendCharacter ( SocketFD,\r
                                    pPort,\r
@@ -440,7 +442,7 @@ RowBytes (
     if ( EFI_ERROR ( Status )) {\r
       break;\r
     }\r
-    pEnd = &pData [ ByteCount ];\r
+    pEnd = &pData[ ByteCount ];\r
     while ( pEnd > pData ) {\r
       Status = HttpSendHexBits ( SocketFD,\r
                                  pPort,\r
@@ -784,8 +786,8 @@ SignatureLookup (
   //  Walk the list of tables\r
   //\r
   Signature = *pSignature;\r
-  pTableId = &mTableId [ 0 ];\r
-  pEnd = &pTableId [ sizeof ( mTableId ) / sizeof ( mTableId [ 0 ])];\r
+  pTableId = &mTableId[ 0 ];\r
+  pEnd = &pTableId[ sizeof ( mTableId ) / sizeof ( mTableId[ 0 ])];\r
   while ( pEnd > pTableId ) {\r
     //\r
     //  Attempt to locate the table signature\r
@@ -848,7 +850,7 @@ AcpiDsdtPage (
       Status = EFI_NOT_FOUND;\r
       break;\r
     }\r
-    pDsdt = (VOID *)pFadt->XDsdt;\r
+    pDsdt = (VOID *)(UINTN)pFadt->XDsdt;\r
 \r
     //\r
     //  Send the page and table header\r
@@ -895,7 +897,7 @@ AcpiDsdtPage (
                             pPort,\r
                             "OEMID",\r
                             sizeof ( pDsdt->OemId ),\r
-                            &pDsdt->OemId [ 0 ]);\r
+                            (CONST CHAR8 *)&pDsdt->OemId[ 0 ]);\r
     if ( EFI_ERROR ( Status )) {\r
       break;\r
     }\r
@@ -903,7 +905,7 @@ AcpiDsdtPage (
                             pPort,\r
                             "OEM Table ID",\r
                             sizeof ( pDsdt->OemTableId ),\r
-                            &pDsdt->OemTableId [ 0 ]);\r
+                            (CONST CHAR8 *)&pDsdt->OemTableId[ 0 ]);\r
     if ( EFI_ERROR ( Status )) {\r
       break;\r
     }\r
@@ -1039,7 +1041,7 @@ AcpiFadtPage (
                             pPort,\r
                             "OEMID",\r
                             sizeof ( pFadt->OemId ),\r
-                            &pFadt->OemId [ 0 ]);\r
+                            (CONST CHAR8 *)&pFadt->OemId[ 0 ]);\r
     if ( EFI_ERROR ( Status )) {\r
       break;\r
     }\r
@@ -1047,7 +1049,7 @@ AcpiFadtPage (
                             pPort,\r
                             "OEM Table ID",\r
                             sizeof ( pFadt->OemTableId ),\r
-                            &pFadt->OemTableId [ 0 ]);\r
+                            (CONST CHAR8 *)&pFadt->OemTableId[ 0 ]);\r
     if ( EFI_ERROR ( Status )) {\r
       break;\r
     }\r
@@ -1576,7 +1578,7 @@ AcpiRsdp10Page (
                             pPort,\r
                             "OemId",\r
                             sizeof ( pRsdp10b->OemId ),\r
-                            &pRsdp10b->OemId [ 0 ]);\r
+                            (CONST CHAR8 *)&pRsdp10b->OemId[ 0 ]);\r
     if ( EFI_ERROR ( Status )) {\r
       break;\r
     }\r
@@ -1679,7 +1681,7 @@ AcpiRsdp30Page (
                             pPort,\r
                             "OemId",\r
                             sizeof ( pRsdp30->OemId ),\r
-                            &pRsdp30->OemId [ 0 ]);\r
+                            (CONST CHAR8 *)&pRsdp30->OemId[ 0 ]);\r
     if ( EFI_ERROR ( Status )) {\r
       break;\r
     }\r
@@ -1709,7 +1711,7 @@ AcpiRsdp30Page (
     Status = RowPointer ( SocketFD,\r
                           pPort,\r
                           "XsdtAddress",\r
-                          (VOID *)pRsdp30->XsdtAddress,\r
+                          (VOID *)(UINTN)pRsdp30->XsdtAddress,\r
                           NULL );\r
     if ( EFI_ERROR ( Status )) {\r
       break;\r
@@ -1726,7 +1728,7 @@ AcpiRsdp30Page (
                         pPort,\r
                         "Reserved",\r
                         sizeof ( pRsdp30->Reserved ),\r
-                        &pRsdp30->Reserved [ 0 ]);\r
+                        &pRsdp30->Reserved[ 0 ]);\r
     if ( EFI_ERROR ( Status )) {\r
       break;\r
     }\r
@@ -1771,7 +1773,7 @@ AcpiRsdtPage (
   CONST CHAR8 * pTableName;\r
   CONST CHAR16 * pWebPage;\r
   EFI_STATUS Status;\r
-  UINT32 TableName [ 2 ];\r
+  UINT32 TableName[ 2 ];\r
 \r
   DBG_ENTER ( );\r
 \r
@@ -1833,7 +1835,7 @@ AcpiRsdtPage (
                             pPort,\r
                             "OEMID",\r
                             sizeof ( pRsdt->OemId ),\r
-                            &pRsdt->OemId [ 0 ]);\r
+                            (CONST CHAR8 *)&pRsdt->OemId[ 0 ]);\r
     if ( EFI_ERROR ( Status )) {\r
       break;\r
     }\r
@@ -1841,7 +1843,7 @@ AcpiRsdtPage (
                             pPort,\r
                             "OEM Table ID",\r
                             sizeof ( pRsdt->OemTableId ),\r
-                            &pRsdt->OemTableId [ 0 ]);\r
+                            (CONST CHAR8 *)&pRsdt->OemTableId[ 0 ]);\r
     if ( EFI_ERROR ( Status )) {\r
       break;\r
     }\r
@@ -1871,16 +1873,16 @@ AcpiRsdtPage (
     //\r
     //  Walk the list of entries\r
     //\r
-    pEntry = &pRsdt->Entry [ 0 ];\r
-    pEnd = &pEntry [(( pRsdt->Length - sizeof ( *pRsdt )) >> 2 ) + 1 ];\r
-    TableName [ 1 ] = 0;\r
+    pEntry = &pRsdt->Entry[ 0 ];\r
+    pEnd = &pEntry[(( pRsdt->Length - sizeof ( *pRsdt )) >> 2 ) + 1 ];\r
+    TableName[ 1 ] = 0;\r
     while ( pEnd > pEntry ) {\r
       //\r
       //  The entry is actually a 32-bit physical table address\r
       //  The first entry in the table is the 32-bit table signature\r
       //\r
-      TableName [ 0 ] = *(UINT32 *)*pEntry;\r
-      pWebPage = SignatureLookup ( &TableName [ 0 ], &pTableName );\r
+      TableName[ 0 ] = *(UINT32 *)*pEntry;\r
+      pWebPage = SignatureLookup ( &TableName[ 0 ], &pTableName );\r
 \r
       //\r
       //  Display the table address\r