UEFI HII: Merge UEFI HII support changes from branch.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4600 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qwang12
2008-01-21 14:41:31 +00:00
parent 93e3992d1e
commit 7d582d6b49
21 changed files with 3518 additions and 3273 deletions

View File

@@ -15,8 +15,6 @@
#ifndef __HII_IMAGE_H__
#define __HII_IMAGE_H__
#error "UEFI 2.1 HII is not fully implemented for now, Please don't include this file now."
#define EFI_HII_IMAGE_PROTOCOL_GUID \
{ 0x31a6406a, 0x6bdf, 0x4e46, { 0xb2, 0xa2, 0xeb, 0xaa, 0x89, 0xc4, 0x9, 0x20 } }
@@ -47,10 +45,10 @@ typedef struct _EFI_HII_IMAGE_PROTOCOL EFI_HII_IMAGE_PROTOCOL;
**/
typedef struct _EFI_IMAGE_INPUT {
UINT32 Flags;
UINT16 Width;
UINT16 Height;
EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Bitmap;
UINT32 Flags;
UINT16 Width;
UINT16 Height;
EFI_GRAPHICS_OUTPUT_BLT_PIXEL Bitmap[1];
} EFI_IMAGE_INPUT;
@@ -83,7 +81,7 @@ typedef
EFI_STATUS
(EFIAPI *EFI_HII_NEW_IMAGE) (
IN CONST EFI_HII_IMAGE_PROTOCOL *This,
IN CONST EFI_HII_HANDLE PackageList,
IN EFI_HII_HANDLE PackageList,
OUT EFI_IMAGE_ID *ImageId,
IN CONST EFI_IMAGE_INPUT *Image
);
@@ -133,8 +131,8 @@ typedef
EFI_STATUS
(EFIAPI *EFI_HII_GET_IMAGE) (
IN CONST EFI_HII_IMAGE_PROTOCOL *This,
IN CONST EFI_HII_HANDLE PackageList,
IN CONST EFI_IMAGE_ID ImageId,
IN EFI_HII_HANDLE PackageList,
IN EFI_IMAGE_ID ImageId,
OUT EFI_IMAGE_INPUT *Image,
OUT UINTN *ImageSize
);
@@ -168,9 +166,9 @@ typedef
EFI_STATUS
(EFIAPI *EFI_HII_SET_IMAGE) (
IN CONST EFI_HII_IMAGE_PROTOCOL *This,
IN CONST EFI_HII_HANDLE PackageList,
IN CONST EFI_IMAGE_ID ImageId,
IN CONST EFI_IMAGE_INPUT Image
IN EFI_HII_HANDLE PackageList,
IN EFI_IMAGE_ID ImageId,
IN CONST EFI_IMAGE_INPUT *Image
);
@@ -264,11 +262,11 @@ typedef
EFI_STATUS
(EFIAPI *EFI_HII_DRAW_IMAGE) (
IN CONST EFI_HII_IMAGE_PROTOCOL *This,
IN CONST EFI_HII_DRAW_FLAGS Flags,
IN CONST EFI_IMAGE_INPUT Image,
IN EFI_HII_DRAW_FLAGS Flags,
IN CONST EFI_IMAGE_INPUT *Image,
IN OUT EFI_IMAGE_OUTPUT **Blt,
IN CONST UINTN BltX,
IN CONST UINTN BltY
IN UINTN BltX,
IN UINTN BltY
);
/**
@@ -342,12 +340,12 @@ typedef
EFI_STATUS
(EFIAPI *EFI_HII_DRAW_IMAGE_ID) (
IN CONST EFI_HII_IMAGE_PROTOCOL *This,
IN CONST EFI_HII_DRAW_FLAGS Flags,
IN CONST EFI_HII_HANDLE PackageList,
IN CONST EFI_IMAGE_ID ImageId,
IN EFI_HII_DRAW_FLAGS Flags,
IN EFI_HII_HANDLE PackageList,
IN EFI_IMAGE_ID ImageId,
IN OUT EFI_IMAGE_OUTPUT **Blt,
IN CONST UINTN BltX,
IN CONST UINTN BltY
IN UINTN BltX,
IN UINTN BltY
);
@@ -379,3 +377,4 @@ extern EFI_GUID gEfiHiiImageProtocolGuid;
#endif