tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
wuyizhong 2006-12-12 08:53:44 +00:00
parent cdcaf781f3
commit 9d3fbdbd47
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c
View File

@ -933,7 +933,7 @@ Returns:
Status = gBS->OpenProtocol ( Status = gBS->OpenProtocol (
ControllerHandle, ControllerHandle,
&gEfiGraphicsOutputProtocolGuid, &gEfiGraphicsOutputProtocolGuid,
&GraphicsOutput, (VOID **) &GraphicsOutput,
This->DriverBindingHandle, This->DriverBindingHandle,
mConOut.VirtualHandle, mConOut.VirtualHandle,
EFI_OPEN_PROTOCOL_GET_PROTOCOL EFI_OPEN_PROTOCOL_GET_PROTOCOL
@ -3153,8 +3153,7 @@ ConSplitterTextOutQueryMode (
// Check whether param ModeNumber is valid. // Check whether param ModeNumber is valid.
// ModeNumber should be within range 0 ~ MaxMode - 1. // ModeNumber should be within range 0 ~ MaxMode - 1.
// //
if ( (ModeNumber < 0) || if ( (ModeNumber > (UINTN)(((UINT32)-1)>>1)) ) {
(ModeNumber > (UINTN)(((UINT32)-1)>>1)) ) {
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }
@ -3208,8 +3207,7 @@ ConSplitterTextOutSetMode (
// Check whether param ModeNumber is valid. // Check whether param ModeNumber is valid.
// ModeNumber should be within range 0 ~ MaxMode - 1. // ModeNumber should be within range 0 ~ MaxMode - 1.
// //
if ( (ModeNumber < 0) || if ( (ModeNumber > (UINTN)(((UINT32)-1)>>1)) ) {
(ModeNumber > (UINTN)(((UINT32)-1)>>1)) ) {
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }

4
EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitterGraphics.c
View File

@ -204,7 +204,7 @@ ConSpliterGraphicsOutputQueryMode (
Status = gBS->AllocatePool ( Status = gBS->AllocatePool (
EfiBootServicesData, EfiBootServicesData,
sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION), sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION),
Info (VOID **) Info
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return Status; return Status;
@ -575,7 +575,7 @@ ConSpliterGraphicsOutputBlt (
Status = UgaDraw->Blt ( Status = UgaDraw->Blt (
UgaDraw, UgaDraw,
(EFI_UGA_PIXEL *) BltBuffer, (EFI_UGA_PIXEL *) BltBuffer,
BltOperation, (EFI_UGA_BLT_OPERATION) BltOperation,
SourceX, SourceX,
SourceY, SourceY,
DestinationX, DestinationX,

10
MdePkg/Include/Common/EfiImage.h
View File

@ -292,6 +292,11 @@ typedef EFI_IMAGE_NT_HEADERS32 EFI_IMAGE_NT_HEADERS;
#define EFI_IMAGE_MACHINE_CROSS_TYPE_SUPPORTED(Machine) (FALSE) #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) #elif defined (MDE_CPU_X64)
#define EFI_IMAGE_MACHINE_TYPE_SUPPORTED(Machine) \ #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) #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 #else
#error Unknown Processor Type #error Unknown Processor Type
#endif #endif