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

8 files changed, 12 insertions, 12 deletions

diff --git a/EdkModulePkg/Core/Dxe/Image/Image.c b/EdkModulePkg/Core/Dxe/Image/Image.c
index daf5fd180b..341df42614 100644
--- a/EdkModulePkg/Core/Dxe/Image/Image.c
+++ b/EdkModulePkg/Core/Dxe/Image/Image.c
@@ -790,7 +790,7 @@ Returns:
              FilePath,

              SourceBuffer,

              SourceSize,

-             (EFI_PHYSICAL_ADDRESS)NULL,

+             (EFI_PHYSICAL_ADDRESS) (UINTN) NULL,

              NULL,

              ImageHandle,

              NULL,

diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c
index 30ee71f763..30b9fdccf5 100644
--- 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;

   ConOutPrivate->GraphicsOutput.Mode->Info->PixelFormat = PixelBltOnly;

   ConOutPrivate->GraphicsOutput.Mode->SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);

-  ConOutPrivate->GraphicsOutput.Mode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) NULL;

+  ConOutPrivate->GraphicsOutput.Mode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) (UINTN) NULL;

   ConOutPrivate->GraphicsOutput.Mode->FrameBufferSize = 0;

 

   ConOutPrivate->GraphicsOutput.Mode->MaxMode = 1;

@@ -1985,7 +1985,7 @@ Returns:
       CurrentGraphicsOutputMode->Info->PixelFormat = PixelBltOnly;

       ZeroMem (&CurrentGraphicsOutputMode->Info->PixelInformation, sizeof (EFI_PIXEL_BITMASK));

       CurrentGraphicsOutputMode->SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);

-      CurrentGraphicsOutputMode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) NULL;

+      CurrentGraphicsOutputMode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) (UINTN) NULL;

       CurrentGraphicsOutputMode->FrameBufferSize = 0;

     }

 

@@ -2021,7 +2021,7 @@ Returns:
     CurrentGraphicsOutputMode->Info->PixelFormat = PixelBltOnly;

     CurrentGraphicsOutputMode->Info->PixelsPerScanLine = 800;

     CurrentGraphicsOutputMode->SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);

-    CurrentGraphicsOutputMode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) NULL;

+    CurrentGraphicsOutputMode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) (UINTN) NULL;

     CurrentGraphicsOutputMode->FrameBufferSize = 0;

 

     //

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopScreen.c b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopScreen.c
index 017b4f3ac0..1923c34972 100644
--- 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 3e81c9eab7..df5a6b5ac5 100644
--- 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 |

     PXE_ROMID_IMP_PACKET_RX_INT_SUPPORTED;

 

-  PxePtr->EntryPoint  = (UINT64) UNDI_APIEntry_new;

+  PxePtr->EntryPoint  = (UINT64) (UINTN) UNDI_APIEntry_new;

   PxePtr->MinorVer    = PXE_ROMID_MINORVER_31;

 

   PxePtr->reserved2[0]  = 0;

diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c
index 1ef670163a..ff22c9b0f5 100644
--- a/MdeModulePkg/Core/Dxe/Image/Image.c
+++ b/MdeModulePkg/Core/Dxe/Image/Image.c
@@ -886,7 +886,7 @@ Returns:
              FilePath,

              SourceBuffer,

              SourceSize,

-             (EFI_PHYSICAL_ADDRESS)NULL,

+             (EFI_PHYSICAL_ADDRESS) (UINTN) NULL,

              NULL,

              ImageHandle,

              NULL,

diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleService.c
index 383916e858..27bc8b346b 100644
--- 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

     // system reset. 

     //

-    if (ScatterGatherList == (EFI_PHYSICAL_ADDRESS) NULL) {

+    if (ScatterGatherList == (EFI_PHYSICAL_ADDRESS) (UINTN) NULL) {

       return EFI_INVALID_PARAMETER;

     } else {

       //

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
index 00c809b6aa..a6fecb8772 100644
--- 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()

     // GraphicsOutputMode->FrameBufferBase, GraphicsOutputMode->FrameBufferSize

     //

-    ConOutPrivate->GraphicsOutput.Mode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) NULL;

+    ConOutPrivate->GraphicsOutput.Mode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) (UINTN) NULL;

     ConOutPrivate->GraphicsOutput.Mode->FrameBufferSize = 0;

 

     ConOutPrivate->GraphicsOutput.Mode->MaxMode = 1;

@@ -2683,7 +2683,7 @@ Returns:
       CurrentGraphicsOutputMode->Info->PixelFormat = PixelBltOnly;

       ZeroMem (&CurrentGraphicsOutputMode->Info->PixelInformation, sizeof (EFI_PIXEL_BITMASK));

       CurrentGraphicsOutputMode->SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);

-      CurrentGraphicsOutputMode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) NULL;

+      CurrentGraphicsOutputMode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) (UINTN) NULL;

       CurrentGraphicsOutputMode->FrameBufferSize = 0;

     }

 

@@ -2732,7 +2732,7 @@ Returns:
     Info->PixelFormat = PixelBltOnly;

     Info->PixelsPerScanLine = UgaHorizontalResolution;

     CurrentGraphicsOutputMode->SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);

-    CurrentGraphicsOutputMode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) NULL;

+    CurrentGraphicsOutputMode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) (UINTN) NULL;

     CurrentGraphicsOutputMode->FrameBufferSize = 0;

 

     //

diff --git a/Nt32Pkg/WinNtGopDxe/WinNtGopScreen.c b/Nt32Pkg/WinNtGopDxe/WinNtGopScreen.c
index f951e87dfe..f663f3243b 100644
--- a/Nt32Pkg/WinNtGopDxe/WinNtGopScreen.c
+++ b/Nt32Pkg/WinNtGopDxe/WinNtGopScreen.c
@@ -1031,7 +1031,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;