diff options
| author | wuyizhong <wuyizhong@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-12-12 07:09:03 +0000 |
|---|---|---|
| committer | wuyizhong <wuyizhong@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-12-12 07:09:03 +0000 |
| commit | 406adcd15cafe2f1f6cff0750ef9bfd8c613013a (patch) | |
| tree | a0f2e98b6ba78d6af198523c0a503fdfe7885c31 /EdkModulePkg/Include | |
| parent | d02920ead2934c94ad3603bdce18d699af027a9f (diff) | |
| download | edk2-406adcd15cafe2f1f6cff0750ef9bfd8c613013a.zip edk2-406adcd15cafe2f1f6cff0750ef9bfd8c613013a.tar.gz edk2-406adcd15cafe2f1f6cff0750ef9bfd8c613013a.tar.bz2 | |
Merge GOP related code from r8->r9.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2085 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'EdkModulePkg/Include')
| -rw-r--r-- | EdkModulePkg/Include/Library/EdkGraphicsLib.h | 4 | ||||
| -rw-r--r-- | EdkModulePkg/Include/Protocol/UgaSplash.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/EdkModulePkg/Include/Library/EdkGraphicsLib.h b/EdkModulePkg/Include/Library/EdkGraphicsLib.h index 52bedd8..30b2a7c 100644 --- a/EdkModulePkg/Include/Library/EdkGraphicsLib.h +++ b/EdkModulePkg/Include/Library/EdkGraphicsLib.h @@ -174,8 +174,8 @@ EFIAPI PrintXY (
IN UINTN X,
IN UINTN Y,
- IN EFI_UGA_PIXEL *Foreground, OPTIONAL
- IN EFI_UGA_PIXEL *Background, OPTIONAL
+ IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Foreground, OPTIONAL
+ IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Background, OPTIONAL
IN CHAR16 *Fmt,
...
)
diff --git a/EdkModulePkg/Include/Protocol/UgaSplash.h b/EdkModulePkg/Include/Protocol/UgaSplash.h index 51dcf52..c5284aa 100644 --- a/EdkModulePkg/Include/Protocol/UgaSplash.h +++ b/EdkModulePkg/Include/Protocol/UgaSplash.h @@ -31,11 +31,11 @@ Abstract: typedef struct _EFI_UGA_SPLASH_PROTOCOL EFI_UGA_SPLASH_PROTOCOL;
-struct _EFI_UGA_SPLASH_PROTOCOL {
+typedef struct _EFI_UGA_SPLASH_PROTOCOL {
UINT32 PixelWidth;
UINT32 PixelHeight;
- EFI_UGA_PIXEL *Image;
-};
+ EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Image;
+} EFI_UGA_SPLASH_PROTOCOL;
extern EFI_GUID gEfiUgaSplashProtocolGuid;
|