UEFI HII: Merge UEFI HII support changes from branch.

[mirror_edk2.git] / IntelFrameworkModulePkg / Universal / HiiDataBaseDxe / HiiDatabase.h

diff --git a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.h b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.h
index 1498f3cc9e545d9acb7eada4634738b62721f39a..9dcfab075b01768af17168432813ed16996a03bb 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.h
+++ b/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.h
@@ -18,7 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _HIIDATABASE_H\r
 \r
 \r
-#include <PiDxe.h>\r
+#include <FrameworkDxe.h>\r
 \r
 #include <Guid/GlobalVariable.h>\r
 #include <Protocol/FrameworkFormCallback.h>\r
@@ -49,7 +49,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 typedef struct _EFI_HII_HANDLE_DATABASE {\r
   VOID                            *Buffer;        // Actual buffer pointer\r
-  EFI_HII_HANDLE                  Handle;         // Monotonically increasing value to signify the value returned to caller\r
+  FRAMEWORK_EFI_HII_HANDLE        Handle;         // Monotonically increasing value to signify the value returned to caller\r
   UINT32                          NumberOfTokens; // The initial number of tokens when first registered\r
   struct _EFI_HII_HANDLE_DATABASE *NextHandleDatabase;\r
 } EFI_HII_HANDLE_DATABASE;\r
@@ -57,8 +57,8 @@ typedef struct _EFI_HII_HANDLE_DATABASE {
 typedef struct {\r
   EFI_NARROW_GLYPH    NarrowGlyphs[MAX_GLYPH_COUNT];\r
   EFI_WIDE_GLYPH      WideGlyphs[MAX_GLYPH_COUNT];\r
-  EFI_KEY_DESCRIPTOR  SystemKeyboardLayout[106];\r
-  EFI_KEY_DESCRIPTOR  OverrideKeyboardLayout[106];\r
+  FRAMEWORK_EFI_KEY_DESCRIPTOR  SystemKeyboardLayout[106];\r
+  FRAMEWORK_EFI_KEY_DESCRIPTOR  OverrideKeyboardLayout[106];\r
   BOOLEAN             SystemKeyboardUpdate;       // Has the SystemKeyboard been updated?\r
 } EFI_HII_GLOBAL_DATA;\r
 \r
@@ -71,7 +71,7 @@ typedef struct {
 } EFI_HII_DATA;\r
 \r
 typedef struct {\r
-  EFI_HII_HANDLE      Handle;\r
+  FRAMEWORK_EFI_HII_HANDLE       Handle;\r
   EFI_GUID            Guid;\r
   EFI_HII_HANDLE_PACK HandlePack;\r
   UINTN               IfrSize;\r
@@ -82,8 +82,8 @@ typedef struct {
 \r
 typedef struct {\r
   EFI_HII_PACK_HEADER   Header;\r
-  EFI_IFR_FORM_SET      FormSet;\r
-  EFI_IFR_END_FORM_SET  EndFormSet;\r
+  FRAMEWORK_EFI_IFR_FORM_SET      FormSet;\r
+  FRAMEWORK_EFI_IFR_END_FORM_SET  EndFormSet;\r
 } EFI_FORM_SET_STUB;\r
 \r
 #define EFI_HII_DATA_FROM_THIS(a) CR (a, EFI_HII_DATA, Hii, EFI_HII_DATA_SIGNATURE)\r
@@ -129,7 +129,7 @@ EFIAPI
 HiiNewPack (\r
   IN  EFI_HII_PROTOCOL      *This,\r
   IN  EFI_HII_PACKAGES      *PackageList,\r
-  OUT EFI_HII_HANDLE        *Handle\r
+  OUT FRAMEWORK_EFI_HII_HANDLE         *Handle\r
   )\r
 ;\r
 \r
@@ -137,7 +137,7 @@ EFI_STATUS
 EFIAPI\r
 HiiRemovePack (\r
   IN EFI_HII_PROTOCOL    *This,\r
-  IN EFI_HII_HANDLE      Handle\r
+  IN FRAMEWORK_EFI_HII_HANDLE       Handle\r
   )\r
 ;\r
 \r
@@ -146,7 +146,7 @@ EFIAPI
 HiiFindHandles (\r
   IN     EFI_HII_PROTOCOL    *This,\r
   IN OUT UINT16              *HandleBufferLength,\r
-  OUT    EFI_HII_HANDLE      *Handle\r
+  OUT    FRAMEWORK_EFI_HII_HANDLE       *Handle\r
   )\r
 ;\r
 \r
@@ -154,7 +154,7 @@ EFI_STATUS
 EFIAPI\r
 HiiExportDatabase (\r
   IN     EFI_HII_PROTOCOL *This,\r
-  IN     EFI_HII_HANDLE   Handle,\r
+  IN     FRAMEWORK_EFI_HII_HANDLE    Handle,\r
   IN OUT UINTN            *BufferSize,\r
   OUT    VOID             *Buffer\r
   )\r
@@ -191,7 +191,7 @@ EFIAPI
 HiiNewString (\r
   IN     EFI_HII_PROTOCOL        *This,\r
   IN     CHAR16                  *Language,\r
-  IN     EFI_HII_HANDLE          Handle,\r
+  IN     FRAMEWORK_EFI_HII_HANDLE Handle,\r
   IN OUT STRING_REF              *Reference,\r
   IN     CHAR16                  *NewString\r
   )\r
@@ -201,7 +201,7 @@ EFI_STATUS
 EFIAPI\r
 HiiGetString (\r
   IN     EFI_HII_PROTOCOL    *This,\r
-  IN     EFI_HII_HANDLE      Handle,\r
+  IN     FRAMEWORK_EFI_HII_HANDLE       Handle,\r
   IN     STRING_REF          Token,\r
   IN     BOOLEAN             Raw,\r
   IN     CHAR16              *LanguageString,\r
@@ -214,7 +214,7 @@ EFI_STATUS
 EFIAPI\r
 HiiResetStrings (\r
   IN     EFI_HII_PROTOCOL    *This,\r
-  IN     EFI_HII_HANDLE      Handle\r
+  IN     FRAMEWORK_EFI_HII_HANDLE       Handle\r
   )\r
 ;\r
 \r
@@ -232,7 +232,7 @@ EFI_STATUS
 EFIAPI\r
 HiiGetPrimaryLanguages (\r
   IN  EFI_HII_PROTOCOL      *This,\r
-  IN  EFI_HII_HANDLE        Handle,\r
+  IN  FRAMEWORK_EFI_HII_HANDLE         Handle,\r
   OUT EFI_STRING            *LanguageString\r
   )\r
 ;\r
@@ -241,7 +241,7 @@ EFI_STATUS
 EFIAPI\r
 HiiGetSecondaryLanguages (\r
   IN  EFI_HII_PROTOCOL      *This,\r
-  IN  EFI_HII_HANDLE        Handle,\r
+  IN  FRAMEWORK_EFI_HII_HANDLE         Handle,\r
   IN  CHAR16                *PrimaryLanguage,\r
   OUT EFI_STRING            *LanguageString\r
   )\r
@@ -251,7 +251,7 @@ EFI_STATUS
 EFIAPI\r
 HiiGetLine (\r
   IN     EFI_HII_PROTOCOL    *This,\r
-  IN     EFI_HII_HANDLE      Handle,\r
+  IN     FRAMEWORK_EFI_HII_HANDLE       Handle,\r
   IN     STRING_REF          Token,\r
   IN OUT UINT16              *Index,\r
   IN     UINT16              LineWidth,\r
@@ -265,7 +265,7 @@ EFI_STATUS
 EFIAPI\r
 HiiGetForms (\r
   IN     EFI_HII_PROTOCOL    *This,\r
-  IN     EFI_HII_HANDLE      Handle,\r
+  IN     FRAMEWORK_EFI_HII_HANDLE       Handle,\r
   IN     EFI_FORM_ID         FormId,\r
   IN OUT UINTN               *BufferLength,\r
   OUT    UINT8               *Buffer\r
@@ -276,7 +276,7 @@ EFI_STATUS
 EFIAPI\r
 HiiGetDefaultImage (\r
   IN     EFI_HII_PROTOCOL           *This,\r
-  IN     EFI_HII_HANDLE             Handle,\r
+  IN     FRAMEWORK_EFI_HII_HANDLE   Handle,\r
   IN     UINTN                      DefaultMask,\r
   OUT    EFI_HII_VARIABLE_PACK_LIST **VariablePackList\r
   )\r
@@ -286,7 +286,7 @@ EFI_STATUS
 EFIAPI\r
 HiiUpdateForm (\r
   IN EFI_HII_PROTOCOL       *This,\r
-  IN EFI_HII_HANDLE         Handle,\r
+  IN FRAMEWORK_EFI_HII_HANDLE          Handle,\r
   IN EFI_FORM_LABEL         Label,\r
   IN BOOLEAN                AddData,\r
   IN EFI_HII_UPDATE_DATA    *Data\r
@@ -298,7 +298,7 @@ EFIAPI
 HiiGetKeyboardLayout (\r
   IN     EFI_HII_PROTOCOL    *This,\r
   OUT    UINT16              *DescriptorCount,\r
-  OUT    EFI_KEY_DESCRIPTOR  *Descriptor\r
+  OUT    FRAMEWORK_EFI_KEY_DESCRIPTOR  *Descriptor\r
   )\r
 ;\r
 \r