diff options
author | qhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-03-29 04:46:03 +0000 |
---|---|---|
committer | qhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-03-29 04:46:03 +0000 |
commit | 57d40fe2af8e43988893ca61fcf4088985ffc15b (patch) | |
tree | ea44d77f22fe6b1495ef842de336db064a20ae87 /EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite | |
parent | 37eba217237e975c5c22045c7ec00943716ac66b (diff) | |
download | edk2-platforms-57d40fe2af8e43988893ca61fcf4088985ffc15b.tar.xz |
GCC cleanup for all EDK I DXE libraries.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4969 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite')
-rw-r--r-- | EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.c | 16 | ||||
-rw-r--r-- | EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Print.c | 40 |
2 files changed, 28 insertions, 28 deletions
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.c index 82933a521d..0f0c6f2010 100644 --- a/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.c +++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.c @@ -313,7 +313,7 @@ Returns: EFI_STATUS Status;
EFI_CONSOLE_CONTROL_PROTOCOL *ConsoleControl;
- Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, &ConsoleControl);
+ Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, (VOID **) &ConsoleControl);
if (EFI_ERROR (Status)) {
return EFI_UNSUPPORTED;
}
@@ -398,7 +398,7 @@ Returns: UINT32 RefreshRate;
EFI_GRAPHICS_OUTPUT_PROTOCOL *GraphicsOutput;
- Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, &ConsoleControl);
+ Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, (VOID **) &ConsoleControl);
if (EFI_ERROR (Status)) {
return EFI_UNSUPPORTED;
}
@@ -407,20 +407,20 @@ Returns: //
// Try to open GOP first
//
- Status = gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiGraphicsOutputProtocolGuid, &GraphicsOutput);
+ Status = gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiGraphicsOutputProtocolGuid, (VOID **) &GraphicsOutput);
if (EFI_ERROR (Status)) {
GraphicsOutput = NULL;
//
// Open GOP failed, try to open UGA
//
- Status = gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiUgaDrawProtocolGuid, &UgaDraw);
+ Status = gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiUgaDrawProtocolGuid, (VOID **) &UgaDraw);
if (EFI_ERROR (Status)) {
return EFI_UNSUPPORTED;
}
}
Badging = NULL;
- Status = gBS->LocateProtocol (&gEfiOEMBadgingProtocolGuid, NULL, &Badging);
+ Status = gBS->LocateProtocol (&gEfiOEMBadgingProtocolGuid, NULL, (VOID **) &Badging);
ConsoleControl->SetMode (ConsoleControl, EfiConsoleControlScreenGraphics);
@@ -462,7 +462,7 @@ Returns: continue;
}
} else {
- Status = GetGraphicsBitMapFromFVEx (ImageHandle, LogoFile, &ImageData, &ImageSize);
+ Status = GetGraphicsBitMapFromFVEx (ImageHandle, LogoFile, (VOID **) &ImageData, &ImageSize);
if (EFI_ERROR (Status)) {
return EFI_UNSUPPORTED;
}
@@ -476,7 +476,7 @@ Returns: Status = ConvertBmpToGopBlt (
ImageData,
ImageSize,
- &Blt,
+ (VOID **) &Blt,
&BltSize,
&Height,
&Width
@@ -609,7 +609,7 @@ Returns: EFI_STATUS Status;
EFI_CONSOLE_CONTROL_PROTOCOL *ConsoleControl;
- Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, &ConsoleControl);
+ Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, (VOID **) &ConsoleControl);
if (EFI_ERROR (Status)) {
return EFI_UNSUPPORTED;
}
diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Print.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Print.c index 2f29293b42..29da2673cf 100644 --- a/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Print.c +++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Print.c @@ -66,22 +66,22 @@ Abstract: #endif
static EFI_GRAPHICS_OUTPUT_BLT_PIXEL mEfiColors[16] = {
- 0x00, 0x00, 0x00, 0x00,
- 0x98, 0x00, 0x00, 0x00,
- 0x00, 0x98, 0x00, 0x00,
- 0x98, 0x98, 0x00, 0x00,
- 0x00, 0x00, 0x98, 0x00,
- 0x98, 0x00, 0x98, 0x00,
- 0x00, 0x98, 0x98, 0x00,
- 0x98, 0x98, 0x98, 0x00,
- 0x10, 0x10, 0x10, 0x00,
- 0xff, 0x10, 0x10, 0x00,
- 0x10, 0xff, 0x10, 0x00,
- 0xff, 0xff, 0x10, 0x00,
- 0x10, 0x10, 0xff, 0x00,
- 0xf0, 0x10, 0xff, 0x00,
- 0x10, 0xff, 0xff, 0x00,
- 0xff, 0xff, 0xff, 0x00,
+ {0x00, 0x00, 0x00, 0x00},
+ {0x98, 0x00, 0x00, 0x00},
+ {0x00, 0x98, 0x00, 0x00},
+ {0x98, 0x98, 0x00, 0x00},
+ {0x00, 0x00, 0x98, 0x00},
+ {0x98, 0x00, 0x98, 0x00},
+ {0x00, 0x98, 0x98, 0x00},
+ {0x98, 0x98, 0x98, 0x00},
+ {0x10, 0x10, 0x10, 0x00},
+ {0xff, 0x10, 0x10, 0x00},
+ {0x10, 0xff, 0x10, 0x00},
+ {0xff, 0xff, 0x10, 0x00},
+ {0x10, 0x10, 0xff, 0x00},
+ {0xf0, 0x10, 0xff, 0x00},
+ {0x10, 0xff, 0xff, 0x00},
+ {0xff, 0xff, 0xff, 0x00},
};
@@ -393,7 +393,7 @@ Returns: Status = gBS->HandleProtocol (
Handle,
&gEfiGraphicsOutputProtocolGuid,
- &GraphicsOutput
+ (VOID **) &GraphicsOutput
);
UgaDraw = NULL;
@@ -403,7 +403,7 @@ Returns: Status = gBS->HandleProtocol (
Handle,
&gEfiUgaDrawProtocolGuid,
- &UgaDraw
+ (VOID **) &UgaDraw
);
if (EFI_ERROR (Status)) {
@@ -414,7 +414,7 @@ Returns: Status = gBS->HandleProtocol (
Handle,
&gEfiSimpleTextOutProtocolGuid,
- &Sto
+ (VOID **) &Sto
);
if (EFI_ERROR (Status)) {
@@ -504,7 +504,7 @@ Returns: Status = gBS->LocateProtocol (
&gEfiPrintProtocolGuid,
NULL,
- &PrintProtocol
+ (VOID **) &PrintProtocol
);
if (EFI_ERROR (Status)) {
return 0;
|