Fix warnings generated by gcc for ia32 builds:

  'cast from pointer to integer of different size'
when casting from a pointer directly to a
64 bit number.  Added an intermediate cast to
UINTN.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5009 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkModulePkg/Core/Dxe/Image/Image.c b/EdkModulePkg/Core/Dxe/Image/Image.c
index daf5fd180b7f815dce19a040757f8d63b65f2fe0..341df426145f685ca5c532d06ef1fcbe7fd56eb6 100644 (file)
--- a/EdkModulePkg/Core/Dxe/Image/Image.c
+++ b/EdkModulePkg/Core/Dxe/Image/Image.c
@@ -790,7 +790,7 @@ Returns:
              FilePath,\r
              SourceBuffer,\r
              SourceSize,\r
-             (EFI_PHYSICAL_ADDRESS)NULL,\r
+             (EFI_PHYSICAL_ADDRESS) (UINTN) NULL,\r
              NULL,\r
              ImageHandle,\r
              NULL,\r

diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c
index 30ee71f7639107ce23a940cc227e5735b8be10ac..30b9fdccf5769450c23bfe47e6849cce1f65f96b 100644 (file)
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c
+++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c
@@ -467,7 +467,7 @@ ConSplitterTextOutConstructor (
   ConOutPrivate->GraphicsOutput.Mode->Info->Version = 0;\r
   ConOutPrivate->GraphicsOutput.Mode->Info->PixelFormat = PixelBltOnly;\r
   ConOutPrivate->GraphicsOutput.Mode->SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
-  ConOutPrivate->GraphicsOutput.Mode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) NULL;\r
+  ConOutPrivate->GraphicsOutput.Mode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) (UINTN) NULL;\r
   ConOutPrivate->GraphicsOutput.Mode->FrameBufferSize = 0;\r
 \r
   ConOutPrivate->GraphicsOutput.Mode->MaxMode = 1;\r
@@ -1985,7 +1985,7 @@ Returns:
       CurrentGraphicsOutputMode->Info->PixelFormat = PixelBltOnly;\r
       ZeroMem (&CurrentGraphicsOutputMode->Info->PixelInformation, sizeof (EFI_PIXEL_BITMASK));\r
       CurrentGraphicsOutputMode->SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
-      CurrentGraphicsOutputMode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) NULL;\r
+      CurrentGraphicsOutputMode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) (UINTN) NULL;\r
       CurrentGraphicsOutputMode->FrameBufferSize = 0;\r
     }\r
 \r
@@ -2021,7 +2021,7 @@ Returns:
     CurrentGraphicsOutputMode->Info->PixelFormat = PixelBltOnly;\r
     CurrentGraphicsOutputMode->Info->PixelsPerScanLine = 800;\r
     CurrentGraphicsOutputMode->SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
-    CurrentGraphicsOutputMode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) NULL;\r
+    CurrentGraphicsOutputMode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) (UINTN) NULL;\r
     CurrentGraphicsOutputMode->FrameBufferSize = 0;\r
 \r
     //\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopScreen.c b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopScreen.c
index 017b4f3ac02e7d7525ee33ef5db3e5499d6972e4..1923c34972b969e4ae01af4e532371767f437021 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopScreen.c
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopScreen.c
@@ -904,7 +904,7 @@ WinNtGopConstructor (
   Private->GraphicsOutput.Mode->Info->VerticalResolution = 0;
   Private->GraphicsOutput.Mode->Info->PixelFormat = PixelBltOnly;
   Private->GraphicsOutput.Mode->SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);
-  Private->GraphicsOutput.Mode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) NULL;
+  Private->GraphicsOutput.Mode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) (UINTN) NULL;
   Private->GraphicsOutput.Mode->FrameBufferSize = 0;
 
   Private->HardwareNeedsStarting  = TRUE;

diff --git a/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Decode.c b/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Decode.c
index 3e81c9eab7f498b56b8c31820d3e658315f1a9a9..df5a6b5ac5539ba691aa5eb648f1add292e91f37 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Decode.c
+++ b/MdeModulePkg/Bus/Pci/UndiRuntimeDxe/Decode.c
@@ -1582,7 +1582,7 @@ Returns:
     PXE_ROMID_IMP_SOFTWARE_INT_SUPPORTED |\r
     PXE_ROMID_IMP_PACKET_RX_INT_SUPPORTED;\r
 \r
-  PxePtr->EntryPoint  = (UINT64) UNDI_APIEntry_new;\r
+  PxePtr->EntryPoint  = (UINT64) (UINTN) UNDI_APIEntry_new;\r
   PxePtr->MinorVer    = PXE_ROMID_MINORVER_31;\r
 \r
   PxePtr->reserved2[0]  = 0;\r

diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c
index 1ef670163a4eba7e8e200ba765bf6cbeb4ab9e13..ff22c9b0f5c3932f22aaffab1723570beb59ef01 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Image/Image.c
+++ b/MdeModulePkg/Core/Dxe/Image/Image.c
@@ -886,7 +886,7 @@ Returns:
              FilePath,\r
              SourceBuffer,\r
              SourceSize,\r
-             (EFI_PHYSICAL_ADDRESS)NULL,\r
+             (EFI_PHYSICAL_ADDRESS) (UINTN) NULL,\r
              NULL,\r
              ImageHandle,\r
              NULL,\r

diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c
index 383916e8587c0361a9e1180323419839d4d48318..27bc8b346b7b72f4b252849ce4917f3ae7297515 100644 (file)
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c
@@ -95,7 +95,7 @@ Returns:
     // ScatterGatherList is only referenced if the capsules are defined to persist across\r
     // system reset. \r
     //\r
-    if (ScatterGatherList == (EFI_PHYSICAL_ADDRESS) NULL) {\r
+    if (ScatterGatherList == (EFI_PHYSICAL_ADDRESS) (UINTN) NULL) {\r
       return EFI_INVALID_PARAMETER;\r
     } else {\r
       //\r

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
index 00c809b6aae4d1cc9afef026ec8bd8f2328469be..a6fecb8772b7f97cc8b836381ac9e14672597910 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
@@ -749,7 +749,7 @@ ConSplitterTextOutConstructor (
     // Initialize the following items, theset items remain unchanged in GraphicsOutput->SetMode()\r
     // GraphicsOutputMode->FrameBufferBase, GraphicsOutputMode->FrameBufferSize\r
     //\r
-    ConOutPrivate->GraphicsOutput.Mode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) NULL;\r
+    ConOutPrivate->GraphicsOutput.Mode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) (UINTN) NULL;\r
     ConOutPrivate->GraphicsOutput.Mode->FrameBufferSize = 0;\r
 \r
     ConOutPrivate->GraphicsOutput.Mode->MaxMode = 1;\r
@@ -2683,7 +2683,7 @@ Returns:
       CurrentGraphicsOutputMode->Info->PixelFormat = PixelBltOnly;\r
       ZeroMem (&CurrentGraphicsOutputMode->Info->PixelInformation, sizeof (EFI_PIXEL_BITMASK));\r
       CurrentGraphicsOutputMode->SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
-      CurrentGraphicsOutputMode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) NULL;\r
+      CurrentGraphicsOutputMode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) (UINTN) NULL;\r
       CurrentGraphicsOutputMode->FrameBufferSize = 0;\r
     }\r
 \r
@@ -2732,7 +2732,7 @@ Returns:
     Info->PixelFormat = PixelBltOnly;\r
     Info->PixelsPerScanLine = UgaHorizontalResolution;\r
     CurrentGraphicsOutputMode->SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
-    CurrentGraphicsOutputMode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) NULL;\r
+    CurrentGraphicsOutputMode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) (UINTN) NULL;\r
     CurrentGraphicsOutputMode->FrameBufferSize = 0;\r
 \r
     //\r

diff --git a/Nt32Pkg/WinNtGopDxe/WinNtGopScreen.c b/Nt32Pkg/WinNtGopDxe/WinNtGopScreen.c
index f951e87dfe09065c06065314f1a61ba14ac4069d..f663f3243ba080f9a92809eaf46f0e0df47658f9 100644 (file)
--- a/Nt32Pkg/WinNtGopDxe/WinNtGopScreen.c
+++ b/Nt32Pkg/WinNtGopDxe/WinNtGopScreen.c
@@ -1031,7 +1031,7 @@ WinNtGopConstructor (
   Private->GraphicsOutput.Mode->Info->VerticalResolution = 0;\r
   Private->GraphicsOutput.Mode->Info->PixelFormat = PixelBltOnly;\r
   Private->GraphicsOutput.Mode->SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
-  Private->GraphicsOutput.Mode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) NULL;\r
+  Private->GraphicsOutput.Mode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) (UINTN) NULL;\r
   Private->GraphicsOutput.Mode->FrameBufferSize = 0;\r
 \r
   Private->HardwareNeedsStarting  = TRUE;\r