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 fc2903eaa068b0dcf51d208fd7f4c5384288548b..1994c052cbb86a3f9bf9c081eab9091e5a83e79f 100644 (file)
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c
+++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c
@@ -933,7 +933,7 @@ Returns:
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiGraphicsOutputProtocolGuid,\r
-                  &GraphicsOutput,\r
+                  (VOID **) &GraphicsOutput,\r
                   This->DriverBindingHandle,\r
                   mConOut.VirtualHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -3153,8 +3153,7 @@ ConSplitterTextOutQueryMode (
   // Check whether param ModeNumber is valid.\r
   // ModeNumber should be within range 0 ~ MaxMode - 1.\r
   //\r
-  if ( (ModeNumber < 0)                         ||\r
-       (ModeNumber > (UINTN)(((UINT32)-1)>>1)) ) {\r
+  if ( (ModeNumber > (UINTN)(((UINT32)-1)>>1)) ) {\r
     return EFI_UNSUPPORTED;\r
   }\r
   \r
@@ -3208,8 +3207,7 @@ ConSplitterTextOutSetMode (
   // Check whether param ModeNumber is valid.\r
   // ModeNumber should be within range 0 ~ MaxMode - 1.\r
   //\r
-  if ( (ModeNumber < 0)                         ||\r
-       (ModeNumber > (UINTN)(((UINT32)-1)>>1)) ) {\r
+  if ( (ModeNumber > (UINTN)(((UINT32)-1)>>1)) ) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r

diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitterGraphics.c b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitterGraphics.c
index 5aa2bae2f05f73505240c74764b2ece3f156a38d..4bc15e6681688a040d823b6429f639fc6b35c37f 100644 (file)
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitterGraphics.c
+++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitterGraphics.c
@@ -204,7 +204,7 @@ ConSpliterGraphicsOutputQueryMode (
   Status = gBS->AllocatePool (\r
                   EfiBootServicesData,\r
                   sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION),\r
-                  Info\r
+                  (VOID **) Info\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -575,7 +575,7 @@ ConSpliterGraphicsOutputBlt (
       Status = UgaDraw->Blt (\r
                               UgaDraw,\r
                               (EFI_UGA_PIXEL *) BltBuffer,\r
-                              BltOperation,\r
+                              (EFI_UGA_BLT_OPERATION) BltOperation,\r
                               SourceX,\r
                               SourceY,\r
                               DestinationX,\r

diff --git a/MdePkg/Include/Common/EfiImage.h b/MdePkg/Include/Common/EfiImage.h
index c20a7a6f64d0c07c006c3e8fdb2d23ed665a8d6b..bf53dcb586ad4a673ef06d9832b04195fdc1fce3 100644 (file)
--- 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;
 \r
 #define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) (FALSE) \r
 \r
+//\r
+// @bug - Remove me when other package updated. \r
+//\r
+typedef EFI_IMAGE_NT_HEADERS64    EFI_IMAGE_NT_HEADERS;\r
+\r
 #elif defined (MDE_CPU_X64)\r
 \r
 #define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \\r
@@ -315,6 +320,11 @@ typedef EFI_IMAGE_NT_HEADERS32    EFI_IMAGE_NT_HEADERS;
 \r
 #define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) (FALSE) \r
 \r
+//\r
+// @bug - Remove me when other package updated. \r
+//\r
+typedef EFI_IMAGE_NT_HEADERS64    EFI_IMAGE_NT_HEADERS;\r
+\r
 #else\r
 #error Unknown Processor Type\r
 #endif\r