diff options
| author | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-01-21 14:41:31 +0000 |
|---|---|---|
| committer | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-01-21 14:41:31 +0000 |
| commit | 7d582d6b499ed30268da033cc17fbde6e7b02a9d (patch) | |
| tree | a875f20c0c31a6f87e92787e2816497bc4dd1a80 /MdePkg/Include/Protocol/HiiFont.h | |
| parent | 93e3992d1ea50fb30c48f498d257d4e66252dd9b (diff) | |
| download | edk2-7d582d6b499ed30268da033cc17fbde6e7b02a9d.tar.gz edk2-7d582d6b499ed30268da033cc17fbde6e7b02a9d.tar.bz2 edk2-7d582d6b499ed30268da033cc17fbde6e7b02a9d.zip | |
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
Diffstat (limited to 'MdePkg/Include/Protocol/HiiFont.h')
| -rw-r--r-- | MdePkg/Include/Protocol/HiiFont.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/MdePkg/Include/Protocol/HiiFont.h b/MdePkg/Include/Protocol/HiiFont.h index c9568aac5a..644416f6e5 100644 --- a/MdePkg/Include/Protocol/HiiFont.h +++ b/MdePkg/Include/Protocol/HiiFont.h @@ -18,8 +18,6 @@ #include <Protocol/GraphicsOutput.h>
#include <Protocol/HiiImage.h>
-#error "UEFI 2.1 HII is not fully implemented for now, Please don't include this file now."
-
#define EFI_HII_FONT_PROTOCOL_GUID \
{ 0xe9ca4775, 0x8657, 0x47fc, { 0x97, 0xe7, 0x7e, 0xd6, 0x5a, 0x8, 0x43, 0x24 } }
@@ -264,12 +262,12 @@ typedef EFI_STATUS
(EFIAPI *EFI_HII_STRING_TO_IMAGE) (
IN CONST EFI_HII_FONT_PROTOCOL *This,
- IN CONST EFI_HII_OUT_FLAGS Flags,
+ IN EFI_HII_OUT_FLAGS Flags,
IN CONST EFI_STRING String,
IN CONST EFI_FONT_DISPLAY_INFO *StringInfo,
IN OUT EFI_IMAGE_OUTPUT **Blt,
- IN CONST UINTN BltX,
- IN CONST UINTN BltY,
+ IN UINTN BltX,
+ IN UINTN BltY,
OUT EFI_HII_ROW_INFO **RowInfoArray OPTIONAL,
OUT UINTN *RowInfoArraySize OPTIONAL,
OUT UINTN *ColumnInfoArray OPTIONAL
@@ -396,14 +394,14 @@ typedef EFI_STATUS
(EFIAPI *EFI_HII_STRING_ID_TO_IMAGE) (
IN CONST EFI_HII_FONT_PROTOCOL *This,
- IN CONST EFI_HII_OUT_FLAGS Flags,
- IN CONST EFI_HII_HANDLE PackageList,
- IN CONST EFI_STRING_ID StringId,
+ IN EFI_HII_OUT_FLAGS Flags,
+ IN EFI_HII_HANDLE PackageList,
+ IN EFI_STRING_ID StringId,
IN CONST CHAR8 *Language,
IN CONST EFI_FONT_DISPLAY_INFO *StringInfo OPTIONAL,
IN OUT EFI_IMAGE_OUTPUT **Blt,
- IN CONST UINTN BltX,
- IN CONST UINTN BltY,
+ IN UINTN BltX,
+ IN UINTN BltY,
OUT EFI_HII_ROW_INFO **RowInfoArray OPTIONAL,
OUT UINTN *RowInfoArraySize OPTIONAL,
OUT UINTN *ColumnInfoArray OPTIONAL
|