From: wuyizhong <wuyizhong@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 12 Dec 2006 08:53:44 +0000 (+0000)
Subject: Fix some minor error. Add EFI_IMAGE_NT_HEADERS definition for IFP and EBC arch.
X-Git-Tag: edk2-stable201903~23790
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=9d3fbdbd473542a0ce831176d2034cad34eacae5

Fix some minor error. Add EFI_IMAGE_NT_HEADERS definition for IFP and EBC arch.

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

diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c
index fc2903eaa0..1994c052cb 100644
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c
+++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c
@@ -933,7 +933,7 @@ Returns:
   Status = gBS->OpenProtocol (
                   ControllerHandle,
                   &gEfiGraphicsOutputProtocolGuid,
-                  &GraphicsOutput,
+                  (VOID **) &GraphicsOutput,
                   This->DriverBindingHandle,
                   mConOut.VirtualHandle,
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL
@@ -3153,8 +3153,7 @@ ConSplitterTextOutQueryMode (
   // Check whether param ModeNumber is valid.
   // ModeNumber should be within range 0 ~ MaxMode - 1.
   //
-  if ( (ModeNumber < 0)                         ||
-       (ModeNumber > (UINTN)(((UINT32)-1)>>1)) ) {
+  if ( (ModeNumber > (UINTN)(((UINT32)-1)>>1)) ) {
     return EFI_UNSUPPORTED;
   }
   
@@ -3208,8 +3207,7 @@ ConSplitterTextOutSetMode (
   // Check whether param ModeNumber is valid.
   // ModeNumber should be within range 0 ~ MaxMode - 1.
   //
-  if ( (ModeNumber < 0)                         ||
-       (ModeNumber > (UINTN)(((UINT32)-1)>>1)) ) {
+  if ( (ModeNumber > (UINTN)(((UINT32)-1)>>1)) ) {
     return EFI_UNSUPPORTED;
   }
 
diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitterGraphics.c b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitterGraphics.c
index 5aa2bae2f0..4bc15e6681 100644
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitterGraphics.c
+++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitterGraphics.c
@@ -204,7 +204,7 @@ ConSpliterGraphicsOutputQueryMode (
   Status = gBS->AllocatePool (
                   EfiBootServicesData,
                   sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION),
-                  Info
+                  (VOID **) Info
                   );
   if (EFI_ERROR (Status)) {
     return Status;
@@ -575,7 +575,7 @@ ConSpliterGraphicsOutputBlt (
       Status = UgaDraw->Blt (
                               UgaDraw,
                               (EFI_UGA_PIXEL *) BltBuffer,
-                              BltOperation,
+                              (EFI_UGA_BLT_OPERATION) BltOperation,
                               SourceX,
                               SourceY,
                               DestinationX,
diff --git a/MdePkg/Include/Common/EfiImage.h b/MdePkg/Include/Common/EfiImage.h
index c20a7a6f64..bf53dcb586 100644
--- a/MdePkg/Include/Common/EfiImage.h
+++ b/MdePkg/Include/Common/EfiImage.h
@@ -292,6 +292,11 @@ typedef EFI_IMAGE_NT_HEADERS32    EFI_IMAGE_NT_HEADERS;
 
 #define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) (FALSE) 
 
+//
+// @bug - Remove me when other package updated. 
+//
+typedef EFI_IMAGE_NT_HEADERS64    EFI_IMAGE_NT_HEADERS;
+
 #elif defined (MDE_CPU_X64)
 
 #define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \
@@ -315,6 +320,11 @@ typedef EFI_IMAGE_NT_HEADERS32    EFI_IMAGE_NT_HEADERS;
 
 #define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) (FALSE) 
 
+//
+// @bug - Remove me when other package updated. 
+//
+typedef EFI_IMAGE_NT_HEADERS64    EFI_IMAGE_NT_HEADERS;
+
 #else
 #error Unknown Processor Type
 #endif