X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=AppPkg%2FApplications%2FSockets%2FWebServer%2FACPI.c;h=7387439f59d2f9b2846d0e94bb9b55428a5b7814;hp=c6caa1a568d2666e9e4d80aeaa308e0f216a78b3;hb=53c31c516489d4cd46d20d59a3705720be3443f1;hpb=59bc059327dd519619fa437c0d7c941e090cd8a3

diff --git a/AppPkg/Applications/Sockets/WebServer/ACPI.c b/AppPkg/Applications/Sockets/WebServer/ACPI.c
index c6caa1a568..7387439f59 100644
--- a/AppPkg/Applications/Sockets/WebServer/ACPI.c
+++ b/AppPkg/Applications/Sockets/WebServer/ACPI.c
@@ -28,7 +28,9 @@ Intel Corporation.
 #include <IndustryStandard/Acpi10.h>
 #include <IndustryStandard/Acpi30.h>
 
+#if defined(_MSC_VER)   //  Handle Microsoft VC++ compiler specifics.
 #pragma warning ( disable : 4305 )
+#endif  //  defined(_MSC_VER)
 
 //
 // Ensure proper structure formats
@@ -178,14 +180,14 @@ LocateRsdt (
     //
     Status = EfiGetSystemConfigurationTable ( &gEfiAcpiTableGuid, (VOID **)&pRsdp30 );
     if ( !EFI_ERROR ( Status )) {
-      pRsdt = (ACPI_RSDT *)pRsdp30->RsdtAddress;
+      pRsdt = (ACPI_RSDT *)(UINTN)pRsdp30->RsdtAddress;
     }
     else {
       Status = EfiGetSystemConfigurationTable (&gEfiAcpi10TableGuid, (VOID **)&pRsdp10b );
       if ( EFI_ERROR ( Status )) {
         break;
       }
-      pRsdt = (ACPI_RSDT *)pRsdp10b->RsdtAddress;
+      pRsdt = (ACPI_RSDT *)(UINTN)pRsdp10b->RsdtAddress;
     }
     break;
   }
@@ -227,14 +229,14 @@ LocateTable (
     //
     Status = EfiGetSystemConfigurationTable ( &gEfiAcpiTableGuid, (VOID **)&pRsdp30 );
     if ( !EFI_ERROR ( Status )) {
-      pRsdt = (ACPI_RSDT *)pRsdp30->RsdtAddress;
+      pRsdt = (ACPI_RSDT *)(UINTN)pRsdp30->RsdtAddress;
     }
     else {
       Status = EfiGetSystemConfigurationTable (&gEfiAcpi10TableGuid, (VOID **)&pRsdp10b );
       if ( EFI_ERROR ( Status )) {
         break;
       }
-      pRsdt = (ACPI_RSDT *)pRsdp10b->RsdtAddress;
+      pRsdt = (ACPI_RSDT *)(UINTN)pRsdp10b->RsdtAddress;
     }
 
     //
@@ -247,9 +249,9 @@ LocateTable (
       //  The entry is actually a 32-bit physical table address
       //  The first entry in the table is the 32-bit table signature
       //
-      pSignature = (UINT32 *)*pEntry;
+      pSignature = (UINT32 *)(UINTN)*pEntry;
       if ( *pSignature == Signature ) {
-        return (CONST VOID *) *pEntry;
+        return (CONST VOID *)(UINTN)*pEntry;
       }
 
       //
@@ -848,7 +850,7 @@ AcpiDsdtPage (
       Status = EFI_NOT_FOUND;
       break;
     }
-    pDsdt = (VOID *)pFadt->XDsdt;
+    pDsdt = (VOID *)(UINTN)pFadt->XDsdt;
 
     //
     //  Send the page and table header
@@ -895,7 +897,7 @@ AcpiDsdtPage (
                             pPort,
                             "OEMID",
                             sizeof ( pDsdt->OemId ),
-                            &pDsdt->OemId[ 0 ]);
+                            (CONST CHAR8 *)&pDsdt->OemId[ 0 ]);
     if ( EFI_ERROR ( Status )) {
       break;
     }
@@ -903,7 +905,7 @@ AcpiDsdtPage (
                             pPort,
                             "OEM Table ID",
                             sizeof ( pDsdt->OemTableId ),
-                            &pDsdt->OemTableId[ 0 ]);
+                            (CONST CHAR8 *)&pDsdt->OemTableId[ 0 ]);
     if ( EFI_ERROR ( Status )) {
       break;
     }
@@ -1039,7 +1041,7 @@ AcpiFadtPage (
                             pPort,
                             "OEMID",
                             sizeof ( pFadt->OemId ),
-                            &pFadt->OemId[ 0 ]);
+                            (CONST CHAR8 *)&pFadt->OemId[ 0 ]);
     if ( EFI_ERROR ( Status )) {
       break;
     }
@@ -1047,7 +1049,7 @@ AcpiFadtPage (
                             pPort,
                             "OEM Table ID",
                             sizeof ( pFadt->OemTableId ),
-                            &pFadt->OemTableId[ 0 ]);
+                            (CONST CHAR8 *)&pFadt->OemTableId[ 0 ]);
     if ( EFI_ERROR ( Status )) {
       break;
     }
@@ -1080,7 +1082,7 @@ AcpiFadtPage (
     Status = RowPointer ( SocketFD,
                           pPort,
                           "FIRMWARE_CTRL",
-                          (CONST VOID *)pFadt->FirmwareCtrl,
+                          (CONST VOID *)(UINTN)pFadt->FirmwareCtrl,
                           NULL );
     if ( EFI_ERROR ( Status )) {
       break;
@@ -1088,7 +1090,7 @@ AcpiFadtPage (
     Status = RowPointer ( SocketFD,
                           pPort,
                           "DSDT",
-                          (CONST VOID *)pFadt->DSDT,
+                          (CONST VOID *)(UINTN)pFadt->DSDT,
                           ( pFadt->DSDT == pFadt->XDsdt ) ? PAGE_ACPI_DSDT : NULL );
     if ( EFI_ERROR ( Status )) {
       break;
@@ -1576,7 +1578,7 @@ AcpiRsdp10Page (
                             pPort,
                             "OemId",
                             sizeof ( pRsdp10b->OemId ),
-                            &pRsdp10b->OemId[ 0 ]);
+                            (CONST CHAR8 *)&pRsdp10b->OemId[ 0 ]);
     if ( EFI_ERROR ( Status )) {
       break;
     }
@@ -1591,7 +1593,7 @@ AcpiRsdp10Page (
     Status = RowPointer ( SocketFD,
                           pPort,
                           "RsdtAddress",
-                          (VOID *)pRsdp10b->RsdtAddress,
+                          (VOID *)(UINTN)pRsdp10b->RsdtAddress,
                           PAGE_ACPI_RSDT );
     if ( EFI_ERROR ( Status )) {
       break;
@@ -1679,7 +1681,7 @@ AcpiRsdp30Page (
                             pPort,
                             "OemId",
                             sizeof ( pRsdp30->OemId ),
-                            &pRsdp30->OemId[ 0 ]);
+                            (CONST CHAR8 *)&pRsdp30->OemId[ 0 ]);
     if ( EFI_ERROR ( Status )) {
       break;
     }
@@ -1694,7 +1696,7 @@ AcpiRsdp30Page (
     Status = RowPointer ( SocketFD,
                           pPort,
                           "RsdtAddress",
-                          (VOID *)pRsdp30->RsdtAddress,
+                          (VOID *)(UINTN)pRsdp30->RsdtAddress,
                           PAGE_ACPI_RSDT );
     if ( EFI_ERROR ( Status )) {
       break;
@@ -1709,7 +1711,7 @@ AcpiRsdp30Page (
     Status = RowPointer ( SocketFD,
                           pPort,
                           "XsdtAddress",
-                          (VOID *)pRsdp30->XsdtAddress,
+                          (VOID *)(UINTN)pRsdp30->XsdtAddress,
                           NULL );
     if ( EFI_ERROR ( Status )) {
       break;
@@ -1833,7 +1835,7 @@ AcpiRsdtPage (
                             pPort,
                             "OEMID",
                             sizeof ( pRsdt->OemId ),
-                            &pRsdt->OemId[ 0 ]);
+                            (CONST CHAR8 *)&pRsdt->OemId[ 0 ]);
     if ( EFI_ERROR ( Status )) {
       break;
     }
@@ -1841,7 +1843,7 @@ AcpiRsdtPage (
                             pPort,
                             "OEM Table ID",
                             sizeof ( pRsdt->OemTableId ),
-                            &pRsdt->OemTableId[ 0 ]);
+                            (CONST CHAR8 *)&pRsdt->OemTableId[ 0 ]);
     if ( EFI_ERROR ( Status )) {
       break;
     }
@@ -1879,7 +1881,7 @@ AcpiRsdtPage (
       //  The entry is actually a 32-bit physical table address
       //  The first entry in the table is the 32-bit table signature
       //
-      TableName[ 0 ] = *(UINT32 *)*pEntry;
+      TableName[ 0 ] = *(UINT32 *)(UINTN)*pEntry;
       pWebPage = SignatureLookup ( &TableName[ 0 ], &pTableName );
 
       //
@@ -1888,7 +1890,7 @@ AcpiRsdtPage (
       Status = RowPointer ( SocketFD,
                             pPort,
                             pTableName,
-                            (VOID *)*pEntry,
+                            (VOID *)(UINTN)*pEntry,
                             pWebPage );
       if ( EFI_ERROR ( Status )) {
         break;