UEFI HII: Merge UEFI HII support changes from branch.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4597 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkPkg/Include/FrameworkDxe.h b/IntelFrameworkPkg/Include/FrameworkDxe.h
index 07eece9670601a111e3b302eeb06eb21c537301c..f43e113d04e8da0b8355d73f0207dcc7421e371e 100644 (file)
--- a/IntelFrameworkPkg/Include/FrameworkDxe.h
+++ b/IntelFrameworkPkg/Include/FrameworkDxe.h
@@ -24,4 +24,6 @@
 \r
 #include <Framework/DxeCis.h>\r
 \r
 \r
 #include <Framework/DxeCis.h>\r
 \r

+#include <Framework/FrameworkInternalFormRepresentation.h>\r
+\r

 #endif\r
 #endif\r

diff --git a/IntelFrameworkPkg/Include/Guid/StatusCodeDataTypeId.h b/IntelFrameworkPkg/Include/Guid/StatusCodeDataTypeId.h
index dbe8fba37c08f552e923b93a360923e14e940fe9..c608b218ff8631443c694297b5e2d55fccc819e5 100644 (file)
--- a/IntelFrameworkPkg/Include/Guid/StatusCodeDataTypeId.h
+++ b/IntelFrameworkPkg/Include/Guid/StatusCodeDataTypeId.h
@@ -24,6 +24,7 @@
 #include <Framework/StatusCode.h>\r
 #include <Framework/DataHubRecords.h>\r
 #include <Protocol/DebugSupport.h>\r
 #include <Framework/StatusCode.h>\r
 #include <Framework/DataHubRecords.h>\r
 #include <Protocol/DebugSupport.h>\r

+#include <Protocol/FrameworkHii.h>\r

 \r
 //////////////////////////////////////////////////////////////////////////////////////////\r
 // String Data Type defintion. This is part of Status Code Specification\r
 \r
 //////////////////////////////////////////////////////////////////////////////////////////\r
 // String Data Type defintion. This is part of Status Code Specification\r


@@ -40,7 +41,7 @@ typedef enum {
 } EFI_STRING_TYPE;\r
 \r
 typedef struct {\r
 } EFI_STRING_TYPE;\r
 \r
 typedef struct {\r

-  EFI_HII_HANDLE  Handle;\r
+  FRAMEWORK_EFI_HII_HANDLE  Handle;\r

   STRING_REF      Token;\r
 } EFI_STATUS_CODE_STRING_TOKEN;\r
 \r
   STRING_REF      Token;\r
 } EFI_STATUS_CODE_STRING_TOKEN;\r
 \r

diff --git a/IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h b/IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h
index d2d74336a0e83e282cabf8a0d1f449315b866cf5..ceb91cf8b94b2f54b1fb0ab51fa49c9dab18adea 100644 (file)
--- a/IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h
+++ b/IntelFrameworkPkg/Include/Library/FrameworkHiiLib.h
@@ -14,10 +14,16 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-#ifndef __HII_LIB_H__\r
-#define __HII_LIB_H__\r
+#ifndef __FRAMEWORK_HII_LIB_H__\r
+#define __FRAMEWORK_HII_LIB_H__\r
+\r
+#include <FrameworkDxe.h>\r

 \r
 #include <Protocol/FrameworkHii.h>\r
 \r
 #include <Protocol/FrameworkHii.h>\r

+//\r
+// FrameworkHiiLib will produce HiiLib library class too.\r
+//\r
+#include <Library/HiiLib.h>\r

 \r
 /**\r
   This function allocates pool for an EFI_HII_PACKAGES structure\r
 \r
 /**\r
   This function allocates pool for an EFI_HII_PACKAGES structure\r


@@ -41,6 +47,4 @@ PreparePackages (
   )\r
 ;\r
 \r
   )\r
 ;\r
 \r

-\r
-\r

 #endif\r
 #endif\r

diff --git a/IntelFrameworkPkg/Include/Library/FrameworkIfrSupportLib.h b/IntelFrameworkPkg/Include/Library/FrameworkIfrSupportLib.h
index d2a1ff5ee4180b20e2106d16088b60bee399f98d..2ea9a01028d05a444207f55470adc5dffc626b8e 100644 (file)
--- a/IntelFrameworkPkg/Include/Library/FrameworkIfrSupportLib.h
+++ b/IntelFrameworkPkg/Include/Library/FrameworkIfrSupportLib.h
@@ -513,7 +513,7 @@ Returns:
 \r
 EFI_STATUS\r
 ExtractDataFromHiiHandle (\r
 \r
 EFI_STATUS\r
 ExtractDataFromHiiHandle (\r

-  IN      EFI_HII_HANDLE      HiiHandle,\r
+  IN      FRAMEWORK_EFI_HII_HANDLE       HiiHandle,\r

   IN OUT  UINT16              *ImageLength,\r
   OUT     UINT8               *DefaultImage,\r
   OUT     EFI_GUID            *Guid\r
   IN OUT  UINT16              *ImageLength,\r
   OUT     UINT8               *DefaultImage,\r
   OUT     EFI_GUID            *Guid\r


@@ -547,7 +547,7 @@ Returns:
 --*/\r
 ;\r
 \r
 --*/\r
 ;\r
 \r

-EFI_HII_HANDLE\r
+FRAMEWORK_EFI_HII_HANDLE \r

 FindHiiHandle (\r
   IN OUT EFI_HII_PROTOCOL    **HiiProtocol, OPTIONAL\r
   IN     EFI_GUID            *Guid\r
 FindHiiHandle (\r
   IN OUT EFI_HII_PROTOCOL    **HiiProtocol, OPTIONAL\r
   IN     EFI_GUID            *Guid\r


@@ -917,7 +917,7 @@ Returns:
 \r
 EFI_STATUS\r
 ValidateDataFromHiiHandle (\r
 \r
 EFI_STATUS\r
 ValidateDataFromHiiHandle (\r

-  IN      EFI_HII_HANDLE      HiiHandle,\r
+  IN      FRAMEWORK_EFI_HII_HANDLE       HiiHandle,\r

   OUT     BOOLEAN             *Results\r
   )\r
 /*++\r
   OUT     BOOLEAN             *Results\r
   )\r
 /*++\r

diff --git a/IntelFrameworkPkg/Include/Protocol/FrameworkFormBrowser.h b/IntelFrameworkPkg/Include/Protocol/FrameworkFormBrowser.h
index 867a5b79bd8c7c6cbbea206c6a6c077937dd6114..14cd53f4d501bc2f6ca86ed08c4534560ebb18fe 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/FrameworkFormBrowser.h
+++ b/IntelFrameworkPkg/Include/Protocol/FrameworkFormBrowser.h
@@ -43,7 +43,7 @@ typedef struct {
 typedef struct {\r
   EFI_HII_IFR_PACK    *IfrData;\r
   EFI_HII_STRING_PACK *StringData;\r
 typedef struct {\r
   EFI_HII_IFR_PACK    *IfrData;\r
   EFI_HII_STRING_PACK *StringData;\r

-} EFI_IFR_PACKET;\r
+} FRAMEWORK_EFI_IFR_PACKET;\r

 \r
 typedef struct {\r
   UINTN LeftColumn;\r
 \r
 typedef struct {\r
   UINTN LeftColumn;\r


@@ -94,9 +94,9 @@ EFI_STATUS
 (EFIAPI *EFI_SEND_FORM) (\r
   IN  EFI_FORM_BROWSER_PROTOCOL       *This,\r
   IN  BOOLEAN                         UseDatabase,\r
 (EFIAPI *EFI_SEND_FORM) (\r
   IN  EFI_FORM_BROWSER_PROTOCOL       *This,\r
   IN  BOOLEAN                         UseDatabase,\r

-  IN  EFI_HII_HANDLE                  *Handle,\r
+  IN  FRAMEWORK_EFI_HII_HANDLE        *Handle,\r

   IN  UINTN                           HandleCount,\r
   IN  UINTN                           HandleCount,\r

-  IN  EFI_IFR_PACKET                  *Packet, OPTIONAL\r
+  IN  FRAMEWORK_EFI_IFR_PACKET                  *Packet, OPTIONAL\r

   IN  EFI_HANDLE                      CallbackHandle, OPTIONAL\r
   IN  UINT8                           *NvMapOverride, OPTIONAL\r
   IN EFI_SCREEN_DESCRIPTOR            *ScreenDimensions, OPTIONAL\r
   IN  EFI_HANDLE                      CallbackHandle, OPTIONAL\r
   IN  UINT8                           *NvMapOverride, OPTIONAL\r
   IN EFI_SCREEN_DESCRIPTOR            *ScreenDimensions, OPTIONAL\r

diff --git a/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h b/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h
index 12aed7dc909630597d80b46301cb7f3a48b66caf..c544deca89c2efb0472cd4038214817903c8b3f6 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h
+++ b/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h
@@ -24,7 +24,7 @@
 #ifndef __FORM_CALLBACK_H__\r
 #define __FORM_CALLBACK_H__\r
 \r
 #ifndef __FORM_CALLBACK_H__\r
 #define __FORM_CALLBACK_H__\r
 \r

-#include <PiDxe.h>\r
+#include <FrameworkDxe.h>\r

 \r
 #include <Protocol/FrameworkHii.h>\r
 #include <Protocol/FrameworkFormBrowser.h>\r
 \r
 #include <Protocol/FrameworkHii.h>\r
 #include <Protocol/FrameworkFormBrowser.h>\r


@@ -50,41 +50,41 @@ typedef struct _EFI_FORM_CALLBACK_PROTOCOL  EFI_FORM_CALLBACK_PROTOCOL;
 #pragma pack(1)\r
 typedef struct {\r
   UINT8   OpCode;           // Likely a string, numeric, or one-of\r
 #pragma pack(1)\r
 typedef struct {\r
   UINT8   OpCode;           // Likely a string, numeric, or one-of\r

-  UINT8   Length;           // Length of the EFI_IFR_DATA_ENTRY packet\r
+  UINT8   Length;           // Length of the FRAMEWORK_EFI_IFR_DATA_ENTRY packet\r

   UINT16  Flags;            // Flags settings to determine what behavior is desired from the browser after the callback\r
   VOID    *Data;            // The data in the form based on the op-code type - this is not a pointer to the data, the data follows immediately\r
   // If the OpCode is a OneOf or Numeric type - Data is a UINT16 value\r
   // If the OpCode is a String type - Data is a CHAR16[x] type\r
   // If the OpCode is a Checkbox type - Data is a UINT8 value\r
   UINT16  Flags;            // Flags settings to determine what behavior is desired from the browser after the callback\r
   VOID    *Data;            // The data in the form based on the op-code type - this is not a pointer to the data, the data follows immediately\r
   // If the OpCode is a OneOf or Numeric type - Data is a UINT16 value\r
   // If the OpCode is a String type - Data is a CHAR16[x] type\r
   // If the OpCode is a Checkbox type - Data is a UINT8 value\r

-  // If the OpCode is a NV Access type - Data is a EFI_IFR_NV_DATA structure\r
+  // If the OpCode is a NV Access type - Data is a FRAMEWORK_EFI_IFR_NV_DATA structure\r

   //\r
   //\r

-} EFI_IFR_DATA_ENTRY;\r
+} FRAMEWORK_EFI_IFR_DATA_ENTRY;\r

 \r
 typedef struct {\r
   VOID                *NvRamMap;  // If the flag of the op-code specified retrieval of a copy of the NVRAM map,\r
   // this is a pointer to a buffer copy\r
   //\r
 \r
 typedef struct {\r
   VOID                *NvRamMap;  // If the flag of the op-code specified retrieval of a copy of the NVRAM map,\r
   // this is a pointer to a buffer copy\r
   //\r

-  UINT32              EntryCount; // How many EFI_IFR_DATA_ENTRY entries\r
+  UINT32              EntryCount; // How many FRAMEWORK_EFI_IFR_DATA_ENTRY entries\r

   //\r
   //\r

-  // EFI_IFR_DATA_ENTRY  Data[1];    // The in-line Data entries.\r
+  // FRAMEWORK_EFI_IFR_DATA_ENTRY  Data[1];    // The in-line Data entries.\r

   //\r
   //\r

-} EFI_IFR_DATA_ARRAY;\r
+} FRAMEWORK_EFI_IFR_DATA_ARRAY;\r

 \r
 \r
 typedef union {\r
 \r
 \r
 typedef union {\r

-  EFI_IFR_DATA_ARRAY  DataArray;  // Primarily used by those who call back to their drivers and use HII as a repository\r
-  EFI_IFR_PACKET      DataPacket; // Primarily used by those which do not use HII as a repository\r
-  CHAR16              *String;  // If returning an error - fill the string with null-terminated contents\r
+  FRAMEWORK_EFI_IFR_DATA_ARRAY  DataArray;  // Primarily used by those who call back to their drivers and use HII as a repository\r
+  FRAMEWORK_EFI_IFR_PACKET      DataPacket; // Primarily used by those which do not use HII as a repository\r
+  CHAR16                        String[1];  // If returning an error - fill the string with null-terminated contents\r

 } EFI_HII_CALLBACK_PACKET;\r
 \r
 typedef struct {\r
 } EFI_HII_CALLBACK_PACKET;\r
 \r
 typedef struct {\r

-  EFI_IFR_OP_HEADER Header;\r
+  FRAMEWORK_EFI_IFR_OP_HEADER Header;\r

   UINT16            QuestionId;   // Offset into the map\r
   UINT8             StorageWidth; // Width of the value\r
   //\r
   // CHAR8             Data[1];      // The Data itself\r
   //\r
   UINT16            QuestionId;   // Offset into the map\r
   UINT8             StorageWidth; // Width of the value\r
   //\r
   // CHAR8             Data[1];      // The Data itself\r
   //\r

-} EFI_IFR_NV_DATA;\r
+} FRAMEWORK_EFI_IFR_NV_DATA;\r

 \r
 #pragma pack()\r
 //\r
 \r
 #pragma pack()\r
 //\r


@@ -178,7 +178,7 @@ EFI_STATUS
 (EFIAPI *EFI_FORM_CALLBACK) (\r
   IN     EFI_FORM_CALLBACK_PROTOCOL    *This,\r
   IN     UINT16                        KeyValue,\r
 (EFIAPI *EFI_FORM_CALLBACK) (\r
   IN     EFI_FORM_CALLBACK_PROTOCOL    *This,\r
   IN     UINT16                        KeyValue,\r

-  IN     EFI_IFR_DATA_ARRAY            *Data,\r
+  IN     FRAMEWORK_EFI_IFR_DATA_ARRAY            *Data,\r

   OUT    EFI_HII_CALLBACK_PACKET       **Packet\r
   );\r
 \r
   OUT    EFI_HII_CALLBACK_PACKET       **Packet\r
   );\r
 \r

diff --git a/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h b/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h
index 32e66ed45d61e3bb6280378360af63b951018df7..1fd197a3f8be802f21cb35abb48928c51f0690e1 100644 (file)
--- a/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h
+++ b/IntelFrameworkPkg/Include/Protocol/FrameworkHii.h
@@ -51,6 +51,8 @@
 \r
 typedef struct _EFI_HII_PROTOCOL  EFI_HII_PROTOCOL;\r
 \r
 \r
 typedef struct _EFI_HII_PROTOCOL  EFI_HII_PROTOCOL;\r
 \r

+typedef UINT16                    FRAMEWORK_EFI_HII_HANDLE;\r
+\r

 //\r
 // Global definition\r
 //\r
 //\r
 // Global definition\r
 //\r


@@ -139,7 +141,7 @@ typedef struct {
 // ********************************************************\r
 //\r
 typedef struct {\r
 // ********************************************************\r
 //\r
 typedef struct {\r

-  EFI_HII_HANDLE  HiiHandle;\r
+  FRAMEWORK_EFI_HII_HANDLE  HiiHandle;\r

   EFI_GUID        PackageGuid;\r
   UINT32          DataTableSize;\r
   UINT32          IfrDataOffset;\r
   EFI_GUID        PackageGuid;\r
   UINT32          DataTableSize;\r
   UINT32          IfrDataOffset;\r


@@ -207,25 +209,6 @@ typedef struct {
   //\r
 } EFI_HII_STRING_PACK;\r
 \r
   //\r
 } EFI_HII_STRING_PACK;\r
 \r

-//\r
-// Glyph Attributes\r
-//\r
-#define EFI_GLYPH_NON_SPACING   1\r
-#define EFI_GLYPH_WIDE          2\r
-\r
-typedef struct {\r
-  CHAR16  UnicodeWeight;\r
-  UINT8   Attributes;\r
-  UINT8   GlyphCol1[GLYPH_HEIGHT];\r
-} EFI_NARROW_GLYPH;\r
-\r
-typedef struct {\r
-  CHAR16  UnicodeWeight;\r
-  UINT8   Attributes;\r
-  UINT8   GlyphCol1[GLYPH_HEIGHT];\r
-  UINT8   GlyphCol2[GLYPH_HEIGHT];\r
-  UINT8   Pad[3];\r
-} EFI_WIDE_GLYPH;\r

 \r
 //\r
 // A font list consists of a font header followed by a series\r
 \r
 //\r
 // A font list consists of a font header followed by a series\r


@@ -249,117 +232,6 @@ typedef struct {
   EFI_HII_PACK_HEADER Header;\r
 } EFI_HII_IFR_PACK_HEADER;\r
 \r
   EFI_HII_PACK_HEADER Header;\r
 } EFI_HII_IFR_PACK_HEADER;\r
 \r

-//\r
-// pedef EFI_HII_PACK_HEADER EFI_HII_IFR_PACK_HEADER;\r
-//\r
-typedef enum {\r
-  EfiKeyLCtrl,\r
-  EfiKeyA0,\r
-  EfiKeyLAlt,\r
-  EfiKeySpaceBar,\r
-  EfiKeyA2,\r
-  EfiKeyA3,\r
-  EfiKeyA4,\r
-  EfiKeyRCtrl,\r
-  EfiKeyLeftArrow,\r
-  EfiKeyDownArrow,\r
-  EfiKeyRightArrow,\r
-  EfiKeyZero,\r
-  EfiKeyPeriod,\r
-  EfiKeyEnter,\r
-  EfiKeyLShift,\r
-  EfiKeyB0,\r
-  EfiKeyB1,\r
-  EfiKeyB2,\r
-  EfiKeyB3,\r
-  EfiKeyB4,\r
-  EfiKeyB5,\r
-  EfiKeyB6,\r
-  EfiKeyB7,\r
-  EfiKeyB8,\r
-  EfiKeyB9,\r
-  EfiKeyB10,\r
-  EfiKeyRshift,\r
-  EfiKeyUpArrow,\r
-  EfiKeyOne,\r
-  EfiKeyTwo,\r
-  EfiKeyThree,\r
-  EfiKeyCapsLock,\r
-  EfiKeyC1,\r
-  EfiKeyC2,\r
-  EfiKeyC3,\r
-  EfiKeyC4,\r
-  EfiKeyC5,\r
-  EfiKeyC6,\r
-  EfiKeyC7,\r
-  EfiKeyC8,\r
-  EfiKeyC9,\r
-  EfiKeyC10,\r
-  EfiKeyC11,\r
-  EfiKeyC12,\r
-  EfiKeyFour,\r
-  EfiKeyFive,\r
-  EfiKeySix,\r
-  EfiKeyPlus,\r
-  EfiKeyTab,\r
-  EfiKeyD1,\r
-  EfiKeyD2,\r
-  EfiKeyD3,\r
-  EfiKeyD4,\r
-  EfiKeyD5,\r
-  EfiKeyD6,\r
-  EfiKeyD7,\r
-  EfiKeyD8,\r
-  EfiKeyD9,\r
-  EfiKeyD10,\r
-  EfiKeyD11,\r
-  EfiKeyD12,\r
-  EfiKeyD13,\r
-  EfiKeyDel,\r
-  EfiKeyEnd,\r
-  EfiKeyPgDn,\r
-  EfiKeySeven,\r
-  EfiKeyEight,\r
-  EfiKeyNine,\r
-  EfiKeyE0,\r
-  EfiKeyE1,\r
-  EfiKeyE2,\r
-  EfiKeyE3,\r
-  EfiKeyE4,\r
-  EfiKeyE5,\r
-  EfiKeyE6,\r
-  EfiKeyE7,\r
-  EfiKeyE8,\r
-  EfiKeyE9,\r
-  EfiKeyE10,\r
-  EfiKeyE11,\r
-  EfiKeyE12,\r
-  EfiKeyBackSpace,\r
-  EfiKeyIns,\r
-  EfiKeyHome,\r
-  EfiKeyPgUp,\r
-  EfiKeyNLck,\r
-  EfiKeySlash,\r
-  EfiKeyAsterisk,\r
-  EfiKeyMinus,\r
-  EfiKeyEsc,\r
-  EfiKeyF1,\r
-  EfiKeyF2,\r
-  EfiKeyF3,\r
-  EfiKeyF4,\r
-  EfiKeyF5,\r
-  EfiKeyF6,\r
-  EfiKeyF7,\r
-  EfiKeyF8,\r
-  EfiKeyF9,\r
-  EfiKeyF10,\r
-  EfiKeyF11,\r
-  EfiKeyF12,\r
-  EfiKeyPrint,\r
-  EfiKeySLck,\r
-  EfiKeyPause\r
-} EFI_KEY;\r
-\r

 typedef struct {\r
   EFI_KEY Key;\r
   CHAR16  Unicode;\r
 typedef struct {\r
   EFI_KEY Key;\r
   CHAR16  Unicode;\r


@@ -367,7 +239,7 @@ typedef struct {
   CHAR16  AltGrUnicode;\r
   CHAR16  ShiftedAltGrUnicode;\r
   UINT16  Modifier;\r
   CHAR16  AltGrUnicode;\r
   CHAR16  ShiftedAltGrUnicode;\r
   UINT16  Modifier;\r

-} EFI_KEY_DESCRIPTOR;\r
+} FRAMEWORK_EFI_KEY_DESCRIPTOR;\r

 \r
 //\r
 // This structure allows a sparse set of keys to be redefined\r
 \r
 //\r
 // This structure allows a sparse set of keys to be redefined\r


@@ -389,7 +261,7 @@ typedef struct {
 //\r
 typedef struct {\r
   EFI_HII_PACK_HEADER Header;\r
 //\r
 typedef struct {\r
   EFI_HII_PACK_HEADER Header;\r

-  EFI_KEY_DESCRIPTOR  *Descriptor;\r
+  FRAMEWORK_EFI_KEY_DESCRIPTOR  *Descriptor;\r

   UINT8               DescriptorCount;\r
 } EFI_HII_KEYBOARD_PACK;\r
 \r
   UINT8               DescriptorCount;\r
 } EFI_HII_KEYBOARD_PACK;\r
 \r


@@ -422,7 +294,7 @@ typedef struct _EFI_HII_VARIABLE_PACK_LIST {
 \r
   @param  This                  A pointer to the EFI_HII_PROTOCOL instance.\r
   @param  Packages              A pointer to an EFI_HII_PACKAGES package instance.\r
 \r
   @param  This                  A pointer to the EFI_HII_PROTOCOL instance.\r
   @param  Packages              A pointer to an EFI_HII_PACKAGES package instance.\r

-  @param  Handle                A pointer to the EFI_HII_HANDLE instance.\r
+  @param  Handle                A pointer to the FRAMEWORK_EFI_HII_HANDLE  instance.\r

 \r
   @retval EFI_SUCCESS           Data was extracted from Packages, the database\r
                                 was updated with the data, and Handle returned successfully.\r
 \r
   @retval EFI_SUCCESS           Data was extracted from Packages, the database\r
                                 was updated with the data, and Handle returned successfully.\r


@@ -434,7 +306,7 @@ EFI_STATUS
 (EFIAPI *EFI_HII_NEW_PACK) (\r
   IN  EFI_HII_PROTOCOL    *This,\r
   IN  EFI_HII_PACKAGES    *Packages,\r
 (EFIAPI *EFI_HII_NEW_PACK) (\r
   IN  EFI_HII_PROTOCOL    *This,\r
   IN  EFI_HII_PACKAGES    *Packages,\r

-  OUT EFI_HII_HANDLE      *Handle\r
+  OUT FRAMEWORK_EFI_HII_HANDLE       *Handle\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -453,7 +325,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_HII_REMOVE_PACK) (\r
   IN EFI_HII_PROTOCOL    *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_HII_REMOVE_PACK) (\r
   IN EFI_HII_PROTOCOL    *This,\r

-  IN EFI_HII_HANDLE      Handle\r
+  IN FRAMEWORK_EFI_HII_HANDLE       Handle\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -463,7 +335,7 @@ EFI_STATUS
   @param  HandleBufferLength    On input, a pointer to the length of the handle\r
                                 buffer. On output, the length of the handle buffer that is required\r
                                 for the handles found.\r
   @param  HandleBufferLength    On input, a pointer to the length of the handle\r
                                 buffer. On output, the length of the handle buffer that is required\r
                                 for the handles found.\r

-  @param  Handle                An array of EFI_HII_HANDLE instances returned.\r
+  @param  Handle                An array of FRAMEWORK_EFI_HII_HANDLE  instances returned.\r

 \r
   @retval EFI_SUCCESS           Handle was updated successfully.\r
   @retval EFI_BUFFER_TOO_SMALL  The HandleBufferLength parameter indicates\r
 \r
   @retval EFI_SUCCESS           Handle was updated successfully.\r
   @retval EFI_BUFFER_TOO_SMALL  The HandleBufferLength parameter indicates\r


@@ -475,14 +347,14 @@ EFI_STATUS
 (EFIAPI *EFI_HII_FIND_HANDLES) (\r
   IN     EFI_HII_PROTOCOL *This,\r
   IN OUT UINT16           *HandleBufferLength,\r
 (EFIAPI *EFI_HII_FIND_HANDLES) (\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
   Exports the contents of the database into a buffer.\r
 \r
   @param  This                  A pointer to the EFI_HII_PROTOCOL instance.\r
   );\r
 \r
 /**\r
   Exports the contents of the database into a buffer.\r
 \r
   @param  This                  A pointer to the EFI_HII_PROTOCOL instance.\r

-  @param  Handle                An EFI_HII_HANDLE that corresponds to the desired\r
+  @param  Handle                An FRAMEWORK_EFI_HII_HANDLE  that corresponds to the desired\r

                                 handle to export. If the value is 0, the entire database will be exported.\r
                                 In either case, the data will be exported in a format described by the\r
                                 structure definition of EFI_HII_EXPORT_TABLE.\r
                                 handle to export. If the value is 0, the entire database will be exported.\r
                                 In either case, the data will be exported in a format described by the\r
                                 structure definition of EFI_HII_EXPORT_TABLE.\r


@@ -499,7 +371,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_HII_EXPORT) (\r
   IN     EFI_HII_PROTOCOL *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_HII_EXPORT) (\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
   IN OUT UINTN            *BufferSize,\r
   OUT    VOID             *Buffer\r
   );\r


@@ -519,7 +391,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_HII_RESET_STRINGS) (\r
   IN     EFI_HII_PROTOCOL   *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_HII_RESET_STRINGS) (\r
   IN     EFI_HII_PROTOCOL   *This,\r

-  IN     EFI_HII_HANDLE     Handle\r
+  IN     FRAMEWORK_EFI_HII_HANDLE      Handle\r

   );\r
 \r
 /**\r
   );\r
 \r
 /**\r


@@ -637,7 +509,7 @@ EFI_STATUS
 (EFIAPI *EFI_HII_NEW_STRING) (\r
   IN     EFI_HII_PROTOCOL      *This,\r
   IN     CHAR16                *Language,\r
 (EFIAPI *EFI_HII_NEW_STRING) (\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
   IN OUT STRING_REF            *Reference,\r
   IN     CHAR16                *NewString\r
   );\r


@@ -659,7 +531,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_HII_GET_PRI_LANGUAGES) (\r
   IN  EFI_HII_PROTOCOL    *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_HII_GET_PRI_LANGUAGES) (\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
   OUT EFI_STRING          *LanguageString\r
   );\r
 \r


@@ -682,7 +554,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_HII_GET_SEC_LANGUAGES) (\r
   IN  EFI_HII_PROTOCOL    *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_HII_GET_SEC_LANGUAGES) (\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
   IN  CHAR16              *PrimaryLanguage,\r
   OUT EFI_STRING          *LanguageString\r
   );\r


@@ -714,7 +586,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_HII_GET_STRING) (\r
   IN     EFI_HII_PROTOCOL  *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_HII_GET_STRING) (\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
   IN     STRING_REF        Token,\r
   IN     BOOLEAN           Raw,\r
   IN     CHAR16            *LanguageString,\r


@@ -748,7 +620,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_HII_GET_LINE) (\r
   IN     EFI_HII_PROTOCOL  *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_HII_GET_LINE) (\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
   IN     STRING_REF        Token,\r
   IN OUT UINT16            *Index,\r
   IN     UINT16            LineWidth,\r


@@ -782,7 +654,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_HII_GET_FORMS) (\r
   IN     EFI_HII_PROTOCOL  *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_HII_GET_FORMS) (\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
   IN     EFI_FORM_ID       FormId,\r
   IN OUT UINTN             *BufferLength,\r
   OUT    UINT8             *Buffer\r


@@ -809,7 +681,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_HII_GET_DEFAULT_IMAGE) (\r
   IN     EFI_HII_PROTOCOL           *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_HII_GET_DEFAULT_IMAGE) (\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
   IN     UINTN                      DefaultMask,\r
   OUT    EFI_HII_VARIABLE_PACK_LIST **VariablePackList\r
   );\r


@@ -835,7 +707,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_HII_UPDATE_FORM) (\r
   IN EFI_HII_PROTOCOL     *This,\r
 EFI_STATUS\r
 (EFIAPI *EFI_HII_UPDATE_FORM) (\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
   IN EFI_FORM_LABEL       Label,\r
   IN BOOLEAN              AddData,\r
   IN EFI_HII_UPDATE_DATA  *Data\r


@@ -847,7 +719,7 @@ EFI_STATUS
   @param  This                  A pointer to the EFI_HII_PROTOCOL instance.\r
   @param  DescriptorCount       A pointer to the number of Descriptor entries being\r
                                 described in the keyboard layout being retrieved.\r
   @param  This                  A pointer to the EFI_HII_PROTOCOL instance.\r
   @param  DescriptorCount       A pointer to the number of Descriptor entries being\r
                                 described in the keyboard layout being retrieved.\r

-  @param  Descriptor            A pointer to a buffer containing an array of EFI_KEY_DESCRIPTOR\r
+  @param  Descriptor            A pointer to a buffer containing an array of FRAMEWORK_EFI_KEY_DESCRIPTOR\r

                                 entries. Each entry will reflect the definition of a specific physical key.\r
 \r
   @retval EFI_SUCCESS           The keyboard layout was retrieved successfully.\r
                                 entries. Each entry will reflect the definition of a specific physical key.\r
 \r
   @retval EFI_SUCCESS           The keyboard layout was retrieved successfully.\r


@@ -858,7 +730,7 @@ EFI_STATUS
 (EFIAPI *EFI_HII_GET_KEYBOARD_LAYOUT) (\r
   IN     EFI_HII_PROTOCOL    *This,\r
   OUT    UINT16              *DescriptorCount,\r
 (EFIAPI *EFI_HII_GET_KEYBOARD_LAYOUT) (\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
   );\r
 \r
 /**\r

diff --git a/IntelFrameworkPkg/IntelFrameworkPkg.dec b/IntelFrameworkPkg/IntelFrameworkPkg.dec
index 337389b861863d00d81872f167b7bad45c61eb63..414102e6000bf94be88c69ad957b25795d07bd23 100644 (file)
--- a/IntelFrameworkPkg/IntelFrameworkPkg.dec
+++ b/IntelFrameworkPkg/IntelFrameworkPkg.dec
@@ -87,7 +87,7 @@
   gEfiSmmIchnDispatchProtocolGuid = { 0xc50b323e, 0x9075, 0x4f2a, { 0xac, 0x8e, 0xd2, 0x59, 0x6a, 0x10, 0x85, 0xcc }}\r
   gEfiFormBrowserProtocolGuid     = {0xe5a1333e, 0xe1b4, 0x4d55, {0xce, 0xeb, 0x35, 0xc3, 0xef, 0x13, 0x34, 0x43 }}\r
   gEfiFormCallbackProtocolGuid   = { 0xF3E4543D, 0xCF35, 0x6CEF, { 0x35, 0xC4, 0x4F, 0xE6, 0x34, 0x4D, 0xFC, 0x54 }}\r
   gEfiSmmIchnDispatchProtocolGuid = { 0xc50b323e, 0x9075, 0x4f2a, { 0xac, 0x8e, 0xd2, 0x59, 0x6a, 0x10, 0x85, 0xcc }}\r
   gEfiFormBrowserProtocolGuid     = {0xe5a1333e, 0xe1b4, 0x4d55, {0xce, 0xeb, 0x35, 0xc3, 0xef, 0x13, 0x34, 0x43 }}\r
   gEfiFormCallbackProtocolGuid   = { 0xF3E4543D, 0xCF35, 0x6CEF, { 0x35, 0xC4, 0x4F, 0xE6, 0x34, 0x4D, 0xFC, 0x54 }}\r

-\r
+  gEfiFormBrowserProtocolGuid    = { 0xE5A1333E, 0xE1B4, 0x4D55, { 0xCE, 0xEB, 0x35, 0xC3, 0xEF, 0x13, 0x34, 0x43 }}\r

 \r
 [Ppis.common]\r
   gEfiPeiBootScriptExecuterPpiGuid = { 0xabd42895, 0x78cf, 0x4872, { 0x84, 0x44, 0x1b, 0x5c, 0x18, 0x0b, 0xfb, 0xff }}\r
 \r
 [Ppis.common]\r
   gEfiPeiBootScriptExecuterPpiGuid = { 0xabd42895, 0x78cf, 0x4872, { 0x84, 0x44, 0x1b, 0x5c, 0x18, 0x0b, 0xfb, 0xff }}\r

diff --git a/IntelFrameworkPkg/IntelFrameworkPkg.dsc b/IntelFrameworkPkg/IntelFrameworkPkg.dsc
index be7a5bce1adeb9b17d12de15cd04bec88f26f39b..e99d917dd6ccd74b58ef4e110ddf6c86deb48dd3 100644 (file)
--- a/IntelFrameworkPkg/IntelFrameworkPkg.dsc
+++ b/IntelFrameworkPkg/IntelFrameworkPkg.dsc
@@ -63,3 +63,5 @@
   IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf\r
   IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLib.inf\r
   IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/PeiSmbusLibSmbusPpi.inf\r
   IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf\r
   IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLib.inf\r
   IntelFrameworkPkg/Library/PeiSmbusLibSmbusPpi/PeiSmbusLibSmbusPpi.inf\r

+  IntelFrameworkPkg/Library/HiiLibFramework/HiiLibFramework.inf\r
+\r

diff --git a/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c
index 913b471c5aa49a75781a6d9ae687377c3f09b27e..1b4c0dd79a2f33e42e7596640ac0bb69c989a3cc 100644 (file)
--- a/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c
+++ b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.c
@@ -17,10 +17,67 @@
 \r
 #include <FrameworkDxe.h>\r
 \r
 \r
 #include <FrameworkDxe.h>\r
 \r

+#include <Protocol/FrameworkHii.h>\r
+\r

 \r
 #include <Library/FrameworkHiiLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 \r
 #include <Library/FrameworkHiiLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r

+#include <Library/UefiBootServicesTableLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
+\r
+EFI_HII_PROTOCOL *mHii = NULL;\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+FrameworkHiiLibConstructor (\r
+  IN EFI_HANDLE           ImageHandle,\r
+  IN EFI_SYSTEM_TABLE     *SystemTable\r
+  )\r
+{\r
+  EFI_STATUS Status;\r
+  \r
+  Status = gBS->LocateProtocol (\r
+      &gEfiHiiProtocolGuid,\r
+      NULL,\r
+      (VOID **) &mHii\r
+    );\r
+  ASSERT_EFI_ERROR (Status);\r
+  ASSERT (mHii != NULL);\r
+\r
+  return EFI_SUCCESS;\r
+}\r
+\r
+\r
+EFI_HII_PACKAGES *\r
+InternalPreparePackages (\r
+  IN UINTN           NumberOfPackages,\r
+  IN CONST EFI_GUID  *Guid OPTIONAL,\r
+  VA_LIST            Marker\r
+  )\r
+{\r
+  EFI_HII_PACKAGES  *HiiPackages;\r
+  VOID              **Package;\r
+  UINTN             Index;\r
+\r
+  ASSERT (NumberOfPackages > 0);\r
+\r
+  HiiPackages                   = AllocateZeroPool (sizeof (EFI_HII_PACKAGES) + NumberOfPackages * sizeof (VOID *));\r
+  ASSERT (HiiPackages != NULL);\r
+\r
+  HiiPackages->GuidId           = (EFI_GUID *) Guid;\r
+  HiiPackages->NumberOfPackages = NumberOfPackages;\r
+  Package                       = (VOID **) (((UINT8 *) HiiPackages) + sizeof (EFI_HII_PACKAGES));\r
+\r
+  for (Index = 0; Index < NumberOfPackages; Index++) {\r
+    *Package = VA_ARG (Marker, VOID *);\r
+    Package++;\r
+  }\r
+\r
+  return HiiPackages;\r
+\r
+}\r
+\r

 \r
 /**\r
   This function allocates pool for an EFI_HII_PACKAGES structure\r
 \r
 /**\r
   This function allocates pool for an EFI_HII_PACKAGES structure\r


@@ -43,28 +100,219 @@ PreparePackages (
   )\r
 {\r
   VA_LIST           Args;\r
   )\r
 {\r
   VA_LIST           Args;\r

-  EFI_HII_PACKAGES  *HiiPackages;\r
-  VOID              **Package;\r
-  UINTN             Index;\r

 \r
 \r

-  ASSERT (NumberOfPackages > 0);\r
+  VA_START (Args, Guid);\r

 \r
 \r

-  HiiPackages                   = AllocateZeroPool (sizeof (EFI_HII_PACKAGES) + NumberOfPackages * sizeof (VOID *));\r
-  ASSERT (HiiPackages != NULL);\r
+  return InternalPreparePackages (NumberOfPackages, Guid, Args);\r
+}\r

 \r
 \r

-  HiiPackages->GuidId           = (EFI_GUID *) Guid;\r
-  HiiPackages->NumberOfPackages = NumberOfPackages;\r
-  Package                       = (VOID **) (((UINT8 *) HiiPackages) + sizeof (EFI_HII_PACKAGES));\r

 \r
 \r

-  VA_START (Args, Guid);\r
+/**\r
+  This function allocates pool for an EFI_HII_PACKAGE_LIST structure\r
+  with additional space that is big enough to host all packages described by the variable \r
+  argument list of package pointers.  The allocated structure is initialized using NumberOfPackages, \r
+  GuidId,  and the variable length argument list of package pointers.\r

 \r
 \r

-  for (Index = 0; Index < NumberOfPackages; Index++) {\r
-    *Package = VA_ARG (Args, VOID *);\r
-    Package++;\r
+  Then, EFI_HII_PACKAGE_LIST will be register to the default System HII Database. The\r
+  Handle to the newly registered Package List is returned throught HiiHandle.\r
+\r
+  @param  NumberOfPackages  The number of HII packages to register.\r
+  @param  GuidId                    Package List GUID ID.\r
+  @param  HiiHandle                The ID used to retrieve the Package List later.\r
+  @param  ...                          The variable argument list describing all HII Package.\r
+\r
+  @return\r
+  The allocated and initialized packages.\r
+\r
+**/\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+HiiLibAddPackagesToHiiDatabase (\r
+  IN       UINTN               NumberOfPackages,\r
+  IN CONST EFI_GUID            *GuidId,\r
+  IN       EFI_HANDLE          DriverHandle, OPTIONAL\r
+  OUT      EFI_HII_HANDLE      *HiiHandle, OPTIONAL\r
+  ...\r
+  )\r
+{\r
+  VA_LIST                   Args;\r
+  EFI_HII_PACKAGES          *FrameworkHiiPacages;\r
+  FRAMEWORK_EFI_HII_HANDLE  FrameworkHiiHandle;\r
+  EFI_STATUS                Status;\r
+\r
+\r
+  VA_START (Args, HiiHandle);\r
+  FrameworkHiiPacages = InternalPreparePackages (NumberOfPackages, GuidId, Args);\r
+\r
+  Status      = mHii->NewPack (mHii, FrameworkHiiPacages, &FrameworkHiiHandle);\r
+  if (HiiHandle != NULL) {\r
+    if (EFI_ERROR (Status)) {\r
+      *HiiHandle = NULL;\r
+    } else {\r
+      *HiiHandle = (EFI_HII_HANDLE) (UINTN) FrameworkHiiHandle;\r
+    }\r

   }\r
 \r
   }\r
 \r

-  VA_END (Args);\r
+  FreePool (FrameworkHiiPacages);\r
+  \r
+  return Status;\r
+}\r

 \r
 \r

-  return HiiPackages;\r
+EFI_STATUS\r
+EFIAPI\r
+HiiLibAddFontPackageToHiiDatabase (\r
+  IN       UINTN               FontSize,\r
+  IN CONST UINT8               *FontBinary,\r
+  IN CONST EFI_GUID            *GuidId,\r
+  OUT      EFI_HII_HANDLE      *HiiHandle OPTIONAL\r
+  )\r
+{\r
+  EFI_STATUS            Status;\r
+  EFI_HII_FONT_PACK     *FontPack;\r
+  UINT8                 *Location;\r
+\r
+  FontPack        = AllocateZeroPool (sizeof (EFI_HII_FONT_PACK) + FontSize);\r
+  ASSERT (FontPack != NULL);\r
+\r
+  FontPack->Header.Length         = (UINT32) (sizeof (EFI_HII_FONT_PACK) + FontSize);\r
+  FontPack->Header.Type           = EFI_HII_FONT;\r
+  FontPack->NumberOfNarrowGlyphs  = (UINT16) (FontSize / sizeof (EFI_NARROW_GLYPH));\r
+\r
+  Location                        = (UINT8 *) (&FontPack->NumberOfWideGlyphs + sizeof (UINT8));\r
+  CopyMem (Location, FontBinary, FontSize);\r
+\r
+\r
+  //\r
+  // Register our Fonts into the global database\r
+  //\r
+  Status = HiiLibAddPackagesToHiiDatabase (1, NULL, HiiHandle, NULL, FontPack);\r
+  //\r
+  // Free the font database\r
+  //\r
+  FreePool (FontPack);\r

 \r
 \r

+  return Status;  \r

 }\r
 }\r

+\r
+EFI_STATUS\r
+EFIAPI\r
+HiiLibRemovePackagesFromHiiDatabase (\r
+  IN      EFI_HII_HANDLE      HiiHandle\r
+  )\r
+{\r
+  return mHii->RemovePack (mHii, (FRAMEWORK_EFI_HII_HANDLE) (UINTN) HiiHandle);\r
+}\r
+\r
+\r
+/**\r
+  This function adds the string into String Package of each language.\r
+\r
+  @param  PackageList            Handle of the package list where this string will\r
+                                 be added.\r
+  @param  StringId               On return, contains the new strings id, which is\r
+                                 unique within PackageList.\r
+  @param  String                 Points to the new null-terminated string.\r
+\r
+  @retval EFI_SUCCESS            The new string was added successfully.\r
+  @retval EFI_NOT_FOUND          The specified PackageList could not be found in\r
+                                 database.\r
+  @retval EFI_OUT_OF_RESOURCES   Could not add the string due to lack of resources.\r
+  @retval EFI_INVALID_PARAMETER  String is NULL or StringId is NULL is NULL.\r
+\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+HiiLibCreateString (\r
+  IN  EFI_HII_HANDLE                  PackageList,\r
+  OUT EFI_STRING_ID                   *StringId,\r
+  IN  CONST EFI_STRING                String\r
+  )\r
+{\r
+  FRAMEWORK_EFI_HII_HANDLE  FrameworkHiiHandle;\r
+  EFI_STATUS                Status;\r
+\r
+  FrameworkHiiHandle = (FRAMEWORK_EFI_HII_HANDLE) (UINTN) PackageList;\r
+  Status = mHii->NewString (\r
+            mHii,\r
+            NULL,\r
+            FrameworkHiiHandle,\r
+            StringId,\r
+            String\r
+          );\r
+\r
+  return Status;\r
+}\r
+\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+HiiLibUpdateString (\r
+  IN  EFI_HII_HANDLE                  PackageList,\r
+  IN  EFI_STRING_ID                   StringId,\r
+  IN  CONST EFI_STRING                String\r
+  )\r
+{\r
+  FRAMEWORK_EFI_HII_HANDLE  FrameworkHiiHandle;\r
+  EFI_STATUS                Status;\r
+\r
+  FrameworkHiiHandle = (FRAMEWORK_EFI_HII_HANDLE) (UINTN) PackageList;\r
+  Status = mHii->NewString (\r
+            mHii,\r
+            NULL,\r
+            FrameworkHiiHandle,\r
+            &StringId,\r
+            String\r
+          );\r
+\r
+  return Status;\r
+}\r
+\r
+//\r
+// Just use the UEFI prototype\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+HiiLibGetStringFromGuidId (\r
+  IN  EFI_GUID                        *ProducerGuid,\r
+  IN  EFI_STRING_ID                   StringId,\r
+  OUT EFI_STRING                      *String\r
+  )\r
+{\r
+  return EFI_SUCCESS;  \r
+}\r
+\r
+//\r
+// Just use the UEFI prototype\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+HiiLibGetStringFromHandle (\r
+  IN  EFI_HII_HANDLE                  PackageList,\r
+  IN  EFI_STRING_ID                   StringId,\r
+  OUT EFI_STRING                      *String\r
+  )\r
+{\r
+  return EFI_SUCCESS;\r
+}\r
+\r
+//\r
+// Just use the UEFI prototype\r
+//\r
+EFI_STATUS\r
+EFIAPI\r
+HiiLibCreateHiiDriverHandle (\r
+  OUT EFI_HANDLE               *DriverHandle\r
+  )\r
+{\r
+  //\r
+  // Driver\r
+  // This implementation does nothing as DriverHandle concept only\r
+  // applies to UEFI HII specification.\r
+  //\r
+  \r
+  *DriverHandle = NULL;\r
+  \r
+  return EFI_SUCCESS;\r
+}\r
+\r

diff --git a/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf
index 98ee9f9ae258ec7c737e08210448696b818a3451..d38275dd83c294388d3a396fb22b35fe235b1450 100644 (file)
--- a/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf
+++ b/IntelFrameworkPkg/Library/FrameworkHiiLib/HiiLib.inf
@@ -20,10 +20,12 @@
   FILE_GUID                      = 1e2c4c2e-67e6-4e57-b3ae-cf5a5af72c2c\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 1e2c4c2e-67e6-4e57-b3ae-cf5a5af72c2c\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r

-  LIBRARY_CLASS                  = FrameworkHiiLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER\r
+  LIBRARY_CLASS                  = FrameworkHiiLib,HiiLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER\r

   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
 \r
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
 \r

+  CONSTRUCTOR                    = FrameworkHiiLibConstructor\r
+\r

 \r
 #\r
 # The following information is for reference only and not required by the build tools.\r
 \r
 #\r
 # The following information is for reference only and not required by the build tools.\r


@@ -41,4 +43,12 @@
 [LibraryClasses]\r
   MemoryAllocationLib\r
   DebugLib\r
 [LibraryClasses]\r
   MemoryAllocationLib\r
   DebugLib\r

+  BaseMemoryLib\r
+  UefiBootServicesTableLib\r
+\r
+[Protocols]\r
+  gEfiHiiProtocolGuid      # ALWAYS_CONSUMED\r
+\r
+[Depex]\r
+  gEfiHiiProtocolGuid      # ALWAYS_CONSUMED\r

 \r
 \r

diff --git a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c
index d9894c4e6cbfca61c5068d592c9a71d2431daf6a..7e5182d7ed6266e03844041db2184a0f24750320 100644 (file)
--- a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c
+++ b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c
@@ -372,52 +372,52 @@ Returns:
   //\r
   // Copy data to the new buffer until we run into the end_form\r
   //\r
   //\r
   // Copy data to the new buffer until we run into the end_form\r
   //\r

-  for (; ((EFI_IFR_OP_HEADER *) Source)->OpCode != EFI_IFR_END_FORM_OP;) {\r
+  for (; ((FRAMEWORK_EFI_IFR_OP_HEADER *) Source)->OpCode != FRAMEWORK_EFI_IFR_END_FORM_OP;) {\r

     //\r
     // If the this opcode is an end_form_set we better be creating and endform\r
     // Nonetheless, we will add data before the end_form_set.  This also provides\r
     // for interesting behavior in the code we will run, but has no bad side-effects\r
     // since we will possibly do a 0 byte copy in this particular end-case.\r
     //\r
     //\r
     // If the this opcode is an end_form_set we better be creating and endform\r
     // Nonetheless, we will add data before the end_form_set.  This also provides\r
     // for interesting behavior in the code we will run, but has no bad side-effects\r
     // since we will possibly do a 0 byte copy in this particular end-case.\r
     //\r

-    if (((EFI_IFR_OP_HEADER *) Source)->OpCode == EFI_IFR_END_FORM_SET_OP) {\r
+    if (((FRAMEWORK_EFI_IFR_OP_HEADER *) Source)->OpCode == FRAMEWORK_EFI_IFR_END_FORM_SET_OP) {\r

       break;\r
     }\r
 \r
     //\r
     // Copy data to new buffer\r
     //\r
       break;\r
     }\r
 \r
     //\r
     // Copy data to new buffer\r
     //\r

-    CopyMem (Destination, Source, ((EFI_IFR_OP_HEADER *) Source)->Length);\r
+    CopyMem (Destination, Source, ((FRAMEWORK_EFI_IFR_OP_HEADER *) Source)->Length);\r

 \r
     //\r
     // Adjust Source/Destination to next op-code location\r
     //\r
 \r
     //\r
     // Adjust Source/Destination to next op-code location\r
     //\r

-    Destination = Destination + (UINTN) ((EFI_IFR_OP_HEADER *) Source)->Length;\r
-    Source      = Source + (UINTN) ((EFI_IFR_OP_HEADER *) Source)->Length;\r
+    Destination = Destination + (UINTN) ((FRAMEWORK_EFI_IFR_OP_HEADER *) Source)->Length;\r
+    Source      = Source + (UINTN) ((FRAMEWORK_EFI_IFR_OP_HEADER *) Source)->Length;\r

   }\r
 \r
   //\r
   // Prior to the end_form is where we insert the new op-code data\r
   //\r
   }\r
 \r
   //\r
   // Prior to the end_form is where we insert the new op-code data\r
   //\r

-  CopyMem (Destination, OpCodeData, ((EFI_IFR_OP_HEADER *) OpCodeData)->Length);\r
-  Destination       = Destination + (UINTN) ((EFI_IFR_OP_HEADER *) OpCodeData)->Length;\r
+  CopyMem (Destination, OpCodeData, ((FRAMEWORK_EFI_IFR_OP_HEADER *) OpCodeData)->Length);\r
+  Destination       = Destination + (UINTN) ((FRAMEWORK_EFI_IFR_OP_HEADER *) OpCodeData)->Length;\r

 \r
 \r

-  NewBuffer->Length = (UINT32) (NewBuffer->Length + (UINT32) (((EFI_IFR_OP_HEADER *) OpCodeData)->Length));\r
+  NewBuffer->Length = (UINT32) (NewBuffer->Length + (UINT32) (((FRAMEWORK_EFI_IFR_OP_HEADER *) OpCodeData)->Length));\r

 \r
   //\r
   // Copy end-form data to new buffer\r
   //\r
 \r
   //\r
   // Copy end-form data to new buffer\r
   //\r

-  CopyMem (Destination, Source, ((EFI_IFR_OP_HEADER *) Source)->Length);\r
+  CopyMem (Destination, Source, ((FRAMEWORK_EFI_IFR_OP_HEADER *) Source)->Length);\r

 \r
   //\r
   // Adjust Source/Destination to next op-code location\r
   //\r
 \r
   //\r
   // Adjust Source/Destination to next op-code location\r
   //\r

-  Destination = Destination + (UINTN) ((EFI_IFR_OP_HEADER *) Source)->Length;\r
-  Source      = Source + (UINTN) ((EFI_IFR_OP_HEADER *) Source)->Length;\r
+  Destination = Destination + (UINTN) ((FRAMEWORK_EFI_IFR_OP_HEADER *) Source)->Length;\r
+  Source      = Source + (UINTN) ((FRAMEWORK_EFI_IFR_OP_HEADER *) Source)->Length;\r

 \r
   //\r
   // Copy end-formset data to new buffer\r
   //\r
 \r
   //\r
   // Copy end-formset data to new buffer\r
   //\r

-  CopyMem (Destination, Source, ((EFI_IFR_OP_HEADER *) Source)->Length);\r
+  CopyMem (Destination, Source, ((FRAMEWORK_EFI_IFR_OP_HEADER *) Source)->Length);\r

 \r
   //\r
   // Zero out the original buffer and copy the updated data in the new buffer to the old buffer\r
 \r
   //\r
   // Zero out the original buffer and copy the updated data in the new buffer to the old buffer\r


@@ -470,7 +470,7 @@ Returns:
 \r
 EFI_STATUS\r
 ExtractDataFromHiiHandle (\r
 \r
 EFI_STATUS\r
 ExtractDataFromHiiHandle (\r

-  IN      EFI_HII_HANDLE      HiiHandle,\r
+  IN      FRAMEWORK_EFI_HII_HANDLE       HiiHandle,\r

   IN OUT  UINT16              *ImageLength,\r
   OUT     UINT8               *DefaultImage,\r
   OUT     EFI_GUID            *Guid\r
   IN OUT  UINT16              *ImageLength,\r
   OUT     UINT8               *DefaultImage,\r
   OUT     EFI_GUID            *Guid\r


@@ -560,31 +560,31 @@ Returns:
   //\r
   RawData = (UINT8 *) ((UINTN) RawData + sizeof (EFI_HII_PACK_HEADER));\r
 \r
   //\r
   RawData = (UINT8 *) ((UINTN) RawData + sizeof (EFI_HII_PACK_HEADER));\r
 \r

-  for (Index = 0; RawData[Index] != EFI_IFR_END_FORM_SET_OP;) {\r
+  for (Index = 0; RawData[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) {\r

     switch (RawData[Index]) {\r
     switch (RawData[Index]) {\r

-    case EFI_IFR_FORM_SET_OP:\r
+    case FRAMEWORK_EFI_IFR_FORM_SET_OP:\r

       //\r
       // Copy the GUID information from this handle\r
       //\r
       //\r
       // Copy the GUID information from this handle\r
       //\r

-      CopyMem (Guid, &((EFI_IFR_FORM_SET *) &RawData[Index])->Guid, sizeof (EFI_GUID));\r
+      CopyMem (Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawData[Index])->Guid, sizeof (EFI_GUID));\r

       break;\r
 \r
       break;\r
 \r

-    case EFI_IFR_ONE_OF_OP:\r
-    case EFI_IFR_CHECKBOX_OP:\r
-    case EFI_IFR_NUMERIC_OP:\r
-    case EFI_IFR_DATE_OP:\r
-    case EFI_IFR_TIME_OP:\r
-    case EFI_IFR_PASSWORD_OP:\r
-    case EFI_IFR_STRING_OP:\r
+    case FRAMEWORK_EFI_IFR_ONE_OF_OP:\r
+    case FRAMEWORK_EFI_IFR_CHECKBOX_OP:\r
+    case FRAMEWORK_EFI_IFR_NUMERIC_OP:\r
+    case FRAMEWORK_EFI_IFR_DATE_OP:\r
+    case FRAMEWORK_EFI_IFR_TIME_OP:\r
+    case FRAMEWORK_EFI_IFR_PASSWORD_OP:\r
+    case FRAMEWORK_EFI_IFR_STRING_OP:\r

       //\r
       // Remember, multiple op-codes may reference the same item, so let's keep a running\r
       // marker of what the highest QuestionId that wasn't zero length.  This will accurately\r
       // maintain the Size of the NvStore\r
       //\r
       //\r
       // Remember, multiple op-codes may reference the same item, so let's keep a running\r
       // marker of what the highest QuestionId that wasn't zero length.  This will accurately\r
       // maintain the Size of the NvStore\r
       //\r

-      if (((EFI_IFR_ONE_OF *) &RawData[Index])->Width != 0) {\r
-        Temp = ((EFI_IFR_ONE_OF *) &RawData[Index])->QuestionId + ((EFI_IFR_ONE_OF *) &RawData[Index])->Width;\r
+      if (((FRAMEWORK_EFI_IFR_ONE_OF *) &RawData[Index])->Width != 0) {\r
+        Temp = ((FRAMEWORK_EFI_IFR_ONE_OF *) &RawData[Index])->QuestionId + ((FRAMEWORK_EFI_IFR_ONE_OF *) &RawData[Index])->Width;\r

         if (SizeOfNvStore < Temp) {\r
         if (SizeOfNvStore < Temp) {\r

-          SizeOfNvStore = ((EFI_IFR_ONE_OF *) &RawData[Index])->QuestionId + ((EFI_IFR_ONE_OF *) &RawData[Index])->Width;\r
+          SizeOfNvStore = ((FRAMEWORK_EFI_IFR_ONE_OF *) &RawData[Index])->QuestionId + ((FRAMEWORK_EFI_IFR_ONE_OF *) &RawData[Index])->Width;\r

         }\r
       }\r
     }\r
         }\r
       }\r
     }\r


@@ -608,26 +608,26 @@ Returns:
   //\r
   // Copy the default image information to the user's buffer\r
   //\r
   //\r
   // Copy the default image information to the user's buffer\r
   //\r

-  for (Index = 0; RawData[Index] != EFI_IFR_END_FORM_SET_OP;) {\r
+  for (Index = 0; RawData[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) {\r

     switch (RawData[Index]) {\r
     switch (RawData[Index]) {\r

-    case EFI_IFR_ONE_OF_OP:\r
-      CachedStart = ((EFI_IFR_ONE_OF *) &RawData[Index])->QuestionId;\r
+    case FRAMEWORK_EFI_IFR_ONE_OF_OP:\r
+      CachedStart = ((FRAMEWORK_EFI_IFR_ONE_OF *) &RawData[Index])->QuestionId;\r

       break;\r
 \r
       break;\r
 \r

-    case EFI_IFR_ONE_OF_OPTION_OP:\r
-      if (((EFI_IFR_ONE_OF_OPTION *) &RawData[Index])->Flags & EFI_IFR_FLAG_DEFAULT) {\r
-        CopyMem (&DefaultImage[CachedStart], &((EFI_IFR_ONE_OF_OPTION *) &RawData[Index])->Value, 2);\r
+    case FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP:\r
+      if (((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) &RawData[Index])->Flags & FRAMEWORK_EFI_IFR_FLAG_DEFAULT) {\r
+        CopyMem (&DefaultImage[CachedStart], &((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) &RawData[Index])->Value, 2);\r

       }\r
       break;\r
 \r
       }\r
       break;\r
 \r

-    case EFI_IFR_CHECKBOX_OP:\r
-      DefaultImage[((EFI_IFR_ONE_OF *) &RawData[Index])->QuestionId] = ((EFI_IFR_CHECKBOX *) &RawData[Index])->Flags;\r
+    case FRAMEWORK_EFI_IFR_CHECKBOX_OP:\r
+      DefaultImage[((FRAMEWORK_EFI_IFR_ONE_OF *) &RawData[Index])->QuestionId] = ((FRAMEWORK_EFI_IFR_CHECKBOX *) &RawData[Index])->Flags;\r

       break;\r
 \r
       break;\r
 \r

-    case EFI_IFR_NUMERIC_OP:\r
+    case FRAMEWORK_EFI_IFR_NUMERIC_OP:\r

       CopyMem (\r
       CopyMem (\r

-        &DefaultImage[((EFI_IFR_ONE_OF *) &RawData[Index])->QuestionId],\r
-        &((EFI_IFR_NUMERIC *) &RawData[Index])->Default,\r
+        &DefaultImage[((FRAMEWORK_EFI_IFR_ONE_OF *) &RawData[Index])->QuestionId],\r
+        &((FRAMEWORK_EFI_IFR_NUMERIC *) &RawData[Index])->Default,\r

         2\r
         );\r
       break;\r
         2\r
         );\r
       break;\r


@@ -648,7 +648,7 @@ Returns:
 }\r
 \r
 \r
 }\r
 \r
 \r

-EFI_HII_HANDLE\r
+FRAMEWORK_EFI_HII_HANDLE \r

 FindHiiHandle (\r
   IN OUT EFI_HII_PROTOCOL    **HiiProtocol, OPTIONAL\r
   IN     EFI_GUID            *Guid\r
 FindHiiHandle (\r
   IN OUT EFI_HII_PROTOCOL    **HiiProtocol, OPTIONAL\r
   IN     EFI_GUID            *Guid\r


@@ -672,8 +672,8 @@ Returns:
 {\r
   EFI_STATUS        Status;\r
 \r
 {\r
   EFI_STATUS        Status;\r
 \r

-  EFI_HII_HANDLE    *HiiHandleBuffer;\r
-  EFI_HII_HANDLE    HiiHandle;\r
+  FRAMEWORK_EFI_HII_HANDLE     *HiiHandleBuffer;\r
+  FRAMEWORK_EFI_HII_HANDLE     HiiHandle;\r

   UINT16            HiiHandleBufferLength;\r
   UINT32            NumberOfHiiHandles;\r
   EFI_GUID          HiiGuid;\r
   UINT16            HiiHandleBufferLength;\r
   UINT32            NumberOfHiiHandles;\r
   EFI_GUID          HiiGuid;\r


@@ -741,7 +741,7 @@ Returns:
     goto lbl_exit;\r
   }\r
 \r
     goto lbl_exit;\r
   }\r
 \r

-  NumberOfHiiHandles = HiiHandleBufferLength / sizeof (EFI_HII_HANDLE);\r
+  NumberOfHiiHandles = HiiHandleBufferLength / sizeof (FRAMEWORK_EFI_HII_HANDLE );\r

 \r
   //\r
   // Iterate Hii handles and look for the one that matches our Guid\r
 \r
   //\r
   // Iterate Hii handles and look for the one that matches our Guid\r


@@ -766,7 +766,7 @@ lbl_exit:
 \r
 EFI_STATUS\r
 ValidateDataFromHiiHandle (\r
 \r
 EFI_STATUS\r
 ValidateDataFromHiiHandle (\r

-  IN      EFI_HII_HANDLE      HiiHandle,\r
+  IN      FRAMEWORK_EFI_HII_HANDLE       HiiHandle,\r

   OUT     BOOLEAN             *Results\r
   )\r
 /*++\r
   OUT     BOOLEAN             *Results\r
   )\r
 /*++\r


@@ -854,36 +854,36 @@ Returns:
   //\r
   RawData = (UINT8 *) ((UINTN) RawData + sizeof (EFI_HII_PACK_HEADER));\r
 \r
   //\r
   RawData = (UINT8 *) ((UINTN) RawData + sizeof (EFI_HII_PACK_HEADER));\r
 \r

-  for (Index = 0; RawData[Index] != EFI_IFR_END_FORM_SET_OP;) {\r
-    if (RawData[Index] == EFI_IFR_FORM_SET_OP) {\r
-      CopyMem (&Guid, &((EFI_IFR_FORM_SET *) &RawData[Index])->Guid, sizeof (EFI_GUID));\r
+  for (Index = 0; RawData[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) {\r
+    if (RawData[Index] == FRAMEWORK_EFI_IFR_FORM_SET_OP) {\r
+      CopyMem (&Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawData[Index])->Guid, sizeof (EFI_GUID));\r

       break;\r
     }\r
 \r
     Index = RawData[Index + 1] + Index;\r
   }\r
 \r
       break;\r
     }\r
 \r
     Index = RawData[Index + 1] + Index;\r
   }\r
 \r

-  for (Index = 0; RawData[Index] != EFI_IFR_END_FORM_SET_OP;) {\r
+  for (Index = 0; RawData[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) {\r

     switch (RawData[Index]) {\r
     switch (RawData[Index]) {\r

-    case EFI_IFR_FORM_SET_OP:\r
+    case FRAMEWORK_EFI_IFR_FORM_SET_OP:\r

       break;\r
 \r
       break;\r
 \r

-    case EFI_IFR_ONE_OF_OP:\r
-    case EFI_IFR_CHECKBOX_OP:\r
-    case EFI_IFR_NUMERIC_OP:\r
-    case EFI_IFR_DATE_OP:\r
-    case EFI_IFR_TIME_OP:\r
-    case EFI_IFR_PASSWORD_OP:\r
-    case EFI_IFR_STRING_OP:\r
+    case FRAMEWORK_EFI_IFR_ONE_OF_OP:\r
+    case FRAMEWORK_EFI_IFR_CHECKBOX_OP:\r
+    case FRAMEWORK_EFI_IFR_NUMERIC_OP:\r
+    case FRAMEWORK_EFI_IFR_DATE_OP:\r
+    case FRAMEWORK_EFI_IFR_TIME_OP:\r
+    case FRAMEWORK_EFI_IFR_PASSWORD_OP:\r
+    case FRAMEWORK_EFI_IFR_STRING_OP:\r

       //\r
       // Remember, multiple op-codes may reference the same item, so let's keep a running\r
       // marker of what the highest QuestionId that wasn't zero length.  This will accurately\r
       // maintain the Size of the NvStore\r
       //\r
       //\r
       // Remember, multiple op-codes may reference the same item, so let's keep a running\r
       // marker of what the highest QuestionId that wasn't zero length.  This will accurately\r
       // maintain the Size of the NvStore\r
       //\r

-      if (((EFI_IFR_ONE_OF *) &RawData[Index])->Width != 0) {\r
-        Temp = ((EFI_IFR_ONE_OF *) &RawData[Index])->QuestionId + ((EFI_IFR_ONE_OF *) &RawData[Index])->Width;\r
+      if (((FRAMEWORK_EFI_IFR_ONE_OF *) &RawData[Index])->Width != 0) {\r
+        Temp = ((FRAMEWORK_EFI_IFR_ONE_OF *) &RawData[Index])->QuestionId + ((FRAMEWORK_EFI_IFR_ONE_OF *) &RawData[Index])->Width;\r

         if (SizeOfNvStore < Temp) {\r
         if (SizeOfNvStore < Temp) {\r

-          SizeOfNvStore = ((EFI_IFR_ONE_OF *) &RawData[Index])->QuestionId + ((EFI_IFR_ONE_OF *) &RawData[Index])->Width;\r
+          SizeOfNvStore = ((FRAMEWORK_EFI_IFR_ONE_OF *) &RawData[Index])->QuestionId + ((FRAMEWORK_EFI_IFR_ONE_OF *) &RawData[Index])->Width;\r

         }\r
       }\r
     }\r
         }\r
       }\r
     }\r


@@ -942,25 +942,25 @@ Returns:
   // This allows for the possibility of stale (obsoleted) data in the variable\r
   // can be overlooked without causing an error\r
   //\r
   // This allows for the possibility of stale (obsoleted) data in the variable\r
   // can be overlooked without causing an error\r
   //\r

-  for (Index = 0; RawData[Index] != EFI_IFR_END_FORM_SET_OP;) {\r
+  for (Index = 0; RawData[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) {\r

     switch (RawData[Index]) {\r
     switch (RawData[Index]) {\r

-    case EFI_IFR_ONE_OF_OP:\r
+    case FRAMEWORK_EFI_IFR_ONE_OF_OP:\r

       //\r
       // A one_of has no data, its the option that does - cache the storage Id\r
       //\r
       //\r
       // A one_of has no data, its the option that does - cache the storage Id\r
       //\r

-      CachedStart = ((EFI_IFR_ONE_OF *) &RawData[Index])->QuestionId;\r
+      CachedStart = ((FRAMEWORK_EFI_IFR_ONE_OF *) &RawData[Index])->QuestionId;\r

       break;\r
 \r
       break;\r
 \r

-    case EFI_IFR_ONE_OF_OPTION_OP:\r
+    case FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP:\r

       //\r
       // A one_of_option can be any value\r
       //\r
       //\r
       // A one_of_option can be any value\r
       //\r

-      if (VariableData[CachedStart] == ((EFI_IFR_ONE_OF_OPTION *) &RawData[Index])->Value) {\r
+      if (VariableData[CachedStart] == ((FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) &RawData[Index])->Value) {\r

         GotMatch = TRUE;\r
       }\r
       break;\r
 \r
         GotMatch = TRUE;\r
       }\r
       break;\r
 \r

-    case EFI_IFR_END_ONE_OF_OP:\r
+    case FRAMEWORK_EFI_IFR_END_ONE_OF_OP:\r

       //\r
       // At this point lets make sure that the data value in the NVRAM matches one of the options\r
       //\r
       //\r
       // At this point lets make sure that the data value in the NVRAM matches one of the options\r
       //\r


@@ -970,20 +970,20 @@ Returns:
       }\r
       break;\r
 \r
       }\r
       break;\r
 \r

-    case EFI_IFR_CHECKBOX_OP:\r
+    case FRAMEWORK_EFI_IFR_CHECKBOX_OP:\r

       //\r
       // A checkbox is a boolean, so 0 and 1 are valid\r
       // Remember, QuestionId corresponds to the offset location of the data in the variable\r
       //\r
       //\r
       // A checkbox is a boolean, so 0 and 1 are valid\r
       // Remember, QuestionId corresponds to the offset location of the data in the variable\r
       //\r

-      if (VariableData[((EFI_IFR_CHECKBOX *) &RawData[Index])->QuestionId] > 1) {\r
+      if (VariableData[((FRAMEWORK_EFI_IFR_CHECKBOX *) &RawData[Index])->QuestionId] > 1) {\r

         *Results = FALSE;\r
         return EFI_SUCCESS;\r
       }\r
       break;\r
 \r
         *Results = FALSE;\r
         return EFI_SUCCESS;\r
       }\r
       break;\r
 \r

-    case EFI_IFR_NUMERIC_OP:\r
-        if ((VariableData[((EFI_IFR_NUMERIC *)&RawData[Index])->QuestionId] < ((EFI_IFR_NUMERIC *)&RawData[Index])->Minimum) ||\r
-            (VariableData[((EFI_IFR_NUMERIC *)&RawData[Index])->QuestionId] > ((EFI_IFR_NUMERIC *)&RawData[Index])->Maximum)) {\r
+    case FRAMEWORK_EFI_IFR_NUMERIC_OP:\r
+        if ((VariableData[((FRAMEWORK_EFI_IFR_NUMERIC *)&RawData[Index])->QuestionId] < ((FRAMEWORK_EFI_IFR_NUMERIC *)&RawData[Index])->Minimum) ||\r
+            (VariableData[((FRAMEWORK_EFI_IFR_NUMERIC *)&RawData[Index])->QuestionId] > ((FRAMEWORK_EFI_IFR_NUMERIC *)&RawData[Index])->Maximum)) {\r

         *Results = FALSE;\r
         return EFI_SUCCESS;\r
       }\r
         *Results = FALSE;\r
         return EFI_SUCCESS;\r
       }\r


@@ -1003,3 +1003,4 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r

+\r

diff --git a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOnTheFly.c b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOnTheFly.c
index e9ab48246cc001a51cb1bcc5efde6c9c89eae2aa..04de7042ea2599e069348a4f74c4f53931d1b677 100644 (file)
--- a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOnTheFly.c
+++ b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOnTheFly.c
@@ -63,8 +63,8 @@ Returns:
 {\r
   EFI_STATUS            Status;\r
   EFI_HII_IFR_PACK      IfrPack;\r
 {\r
   EFI_STATUS            Status;\r
   EFI_HII_IFR_PACK      IfrPack;\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

   UINT8                 *Destination;\r
   CHAR16                CurrentLanguage[4];\r
   STRING_REF            StringToken;\r
   UINT8                 *Destination;\r
   CHAR16                CurrentLanguage[4];\r
   STRING_REF            StringToken;\r


@@ -103,14 +103,14 @@ Returns:
   //\r
   // Initialize the Ifr Package header data\r
   //\r
   //\r
   // Initialize the Ifr Package header data\r
   //\r

-  IfrPack.Header.Length = sizeof (EFI_HII_PACK_HEADER) + sizeof (EFI_IFR_FORM_SET) + sizeof (EFI_IFR_END_FORM_SET);\r
+  IfrPack.Header.Length = sizeof (EFI_HII_PACK_HEADER) + sizeof (FRAMEWORK_EFI_IFR_FORM_SET) + sizeof (FRAMEWORK_EFI_IFR_END_FORM_SET);\r

   IfrPack.Header.Type   = EFI_HII_IFR;\r
 \r
   //\r
   // Initialize FormSet with the appropriate information\r
   //\r
   IfrPack.Header.Type   = EFI_HII_IFR;\r
 \r
   //\r
   // Initialize FormSet with the appropriate information\r
   //\r

-  FormSet.Header.OpCode = EFI_IFR_FORM_SET_OP;\r
-  FormSet.Header.Length = sizeof (EFI_IFR_FORM_SET);\r
+  FormSet.Header.OpCode = FRAMEWORK_EFI_IFR_FORM_SET_OP;\r
+  FormSet.Header.Length = sizeof (FRAMEWORK_EFI_IFR_FORM_SET);\r

   FormSet.FormSetTitle  = StringToken;\r
   FormSet.Class         = Class;\r
   FormSet.SubClass      = SubClass;\r
   FormSet.FormSetTitle  = StringToken;\r
   FormSet.Class         = Class;\r
   FormSet.SubClass      = SubClass;\r


@@ -119,8 +119,8 @@ Returns:
   //\r
   // Initialize the end formset data\r
   //\r
   //\r
   // Initialize the end formset data\r
   //\r

-  EndFormSet.Header.Length  = sizeof (EFI_IFR_END_FORM_SET);\r
-  EndFormSet.Header.OpCode  = EFI_IFR_END_FORM_SET_OP;\r
+  EndFormSet.Header.Length  = sizeof (FRAMEWORK_EFI_IFR_END_FORM_SET);\r
+  EndFormSet.Header.OpCode  = FRAMEWORK_EFI_IFR_END_FORM_SET_OP;\r

 \r
   Destination               = (UINT8 *) *FormBuffer;\r
 \r
 \r
   Destination               = (UINT8 *) *FormBuffer;\r
 \r


@@ -131,11 +131,11 @@ Returns:
 \r
   Destination = Destination + sizeof (EFI_HII_PACK_HEADER);\r
 \r
 \r
   Destination = Destination + sizeof (EFI_HII_PACK_HEADER);\r
 \r

-  CopyMem (Destination, &FormSet, sizeof (EFI_IFR_FORM_SET));\r
+  CopyMem (Destination, &FormSet, sizeof (FRAMEWORK_EFI_IFR_FORM_SET));\r

 \r
 \r

-  Destination = Destination + sizeof (EFI_IFR_FORM_SET);\r
+  Destination = Destination + sizeof (FRAMEWORK_EFI_IFR_FORM_SET);\r

 \r
 \r

-  CopyMem (Destination, &EndFormSet, sizeof (EFI_IFR_END_FORM_SET));\r
+  CopyMem (Destination, &EndFormSet, sizeof (FRAMEWORK_EFI_IFR_END_FORM_SET));\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r


@@ -170,8 +170,8 @@ Returns:
 --*/\r
 {\r
   EFI_STATUS        Status;\r
 --*/\r
 {\r
   EFI_STATUS        Status;\r

-  EFI_IFR_FORM      Form;\r
-  EFI_IFR_END_FORM  EndForm;\r
+  FRAMEWORK_EFI_IFR_FORM      Form;\r
+  FRAMEWORK_EFI_IFR_END_FORM  EndForm;\r

   CHAR16            CurrentLanguage[4];\r
   STRING_REF        StringToken;\r
 \r
   CHAR16            CurrentLanguage[4];\r
   STRING_REF        StringToken;\r
 \r


@@ -186,8 +186,8 @@ Returns:
     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r

-  Form.Header.OpCode  = EFI_IFR_FORM_OP;\r
-  Form.Header.Length  = sizeof (EFI_IFR_FORM);\r
+  Form.Header.OpCode  = FRAMEWORK_EFI_IFR_FORM_OP;\r
+  Form.Header.Length  = sizeof (FRAMEWORK_EFI_IFR_FORM);\r

   Form.FormId         = FormId;\r
   Form.FormTitle      = StringToken;\r
 \r
   Form.FormId         = FormId;\r
   Form.FormTitle      = StringToken;\r
 \r


@@ -197,8 +197,8 @@ Returns:
     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r

-  EndForm.Header.OpCode = EFI_IFR_END_FORM_OP;\r
-  EndForm.Header.Length = sizeof (EFI_IFR_END_FORM);\r
+  EndForm.Header.OpCode = FRAMEWORK_EFI_IFR_END_FORM_OP;\r
+  EndForm.Header.Length = sizeof (FRAMEWORK_EFI_IFR_END_FORM);\r

 \r
   Status                = AddOpCode (FormBuffer, &EndForm);\r
 \r
 \r
   Status                = AddOpCode (FormBuffer, &EndForm);\r
 \r


@@ -237,7 +237,7 @@ Returns:
 --*/\r
 {\r
   EFI_STATUS        Status;\r
 --*/\r
 {\r
   EFI_STATUS        Status;\r

-  EFI_IFR_SUBTITLE  Subtitle;\r
+  FRAMEWORK_EFI_IFR_SUBTITLE  Subtitle;\r

   CHAR16            CurrentLanguage[4];\r
   STRING_REF        StringToken;\r
 \r
   CHAR16            CurrentLanguage[4];\r
   STRING_REF        StringToken;\r
 \r


@@ -252,8 +252,8 @@ Returns:
     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r

-  Subtitle.Header.OpCode  = EFI_IFR_SUBTITLE_OP;\r
-  Subtitle.Header.Length  = sizeof (EFI_IFR_SUBTITLE);\r
+  Subtitle.Header.OpCode  = FRAMEWORK_EFI_IFR_SUBTITLE_OP;\r
+  Subtitle.Header.Length  = sizeof (FRAMEWORK_EFI_IFR_SUBTITLE);\r

   Subtitle.SubTitle       = StringToken;\r
 \r
   Status                  = AddOpCode (FormBuffer, &Subtitle);\r
   Subtitle.SubTitle       = StringToken;\r
 \r
   Status                  = AddOpCode (FormBuffer, &Subtitle);\r


@@ -305,7 +305,7 @@ Returns:
 --*/\r
 {\r
   EFI_STATUS    Status;\r
 --*/\r
 {\r
   EFI_STATUS    Status;\r

-  EFI_IFR_TEXT  Text;\r
+  FRAMEWORK_EFI_IFR_TEXT  Text;\r

   CHAR16        CurrentLanguage[4];\r
   STRING_REF    StringToken;\r
 \r
   CHAR16        CurrentLanguage[4];\r
   STRING_REF    StringToken;\r
 \r


@@ -323,8 +323,8 @@ Returns:
     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r

-  Text.Header.OpCode  = EFI_IFR_TEXT_OP;\r
-  Text.Header.Length  = sizeof (EFI_IFR_TEXT);\r
+  Text.Header.OpCode  = FRAMEWORK_EFI_IFR_TEXT_OP;\r
+  Text.Header.Length  = sizeof (FRAMEWORK_EFI_IFR_TEXT);\r

   Text.Text           = StringToken;\r
 \r
   //\r
   Text.Text           = StringToken;\r
 \r
   //\r


@@ -338,7 +338,7 @@ Returns:
 \r
   Text.TextTwo  = StringToken;\r
 \r
 \r
   Text.TextTwo  = StringToken;\r
 \r

-  Text.Flags    = (UINT8) (Flags | EFI_IFR_FLAG_CREATED);\r
+  Text.Flags    = (UINT8) (Flags | FRAMEWORK_EFI_IFR_FLAG_CREATED);\r

   Text.Key      = Key;\r
 \r
   //\r
   Text.Key      = Key;\r
 \r
   //\r


@@ -392,7 +392,7 @@ Returns:
 --*/\r
 {\r
   EFI_STATUS  Status;\r
 --*/\r
 {\r
   EFI_STATUS  Status;\r

-  EFI_IFR_REF Hyperlink;\r
+  FRAMEWORK_EFI_IFR_REF Hyperlink;\r

   CHAR16      CurrentLanguage[4];\r
   STRING_REF  StringToken;\r
 \r
   CHAR16      CurrentLanguage[4];\r
   STRING_REF  StringToken;\r
 \r


@@ -407,8 +407,8 @@ Returns:
     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r

-  Hyperlink.Header.OpCode = EFI_IFR_REF_OP;\r
-  Hyperlink.Header.Length = sizeof (EFI_IFR_REF);\r
+  Hyperlink.Header.OpCode = FRAMEWORK_EFI_IFR_REF_OP;\r
+  Hyperlink.Header.Length = sizeof (FRAMEWORK_EFI_IFR_REF);\r

   Hyperlink.FormId        = FormId;\r
   Hyperlink.Prompt        = StringToken;\r
 \r
   Hyperlink.FormId        = FormId;\r
   Hyperlink.Prompt        = StringToken;\r
 \r


@@ -468,9 +468,9 @@ Returns:
 {\r
   EFI_STATUS            Status;\r
   UINTN                 Index;\r
 {\r
   EFI_STATUS            Status;\r
   UINTN                 Index;\r

-  EFI_IFR_ONE_OF        OneOf;\r
-  EFI_IFR_ONE_OF_OPTION OneOfOption;\r
-  EFI_IFR_END_ONE_OF    EndOneOf;\r
+  FRAMEWORK_EFI_IFR_ONE_OF        OneOf;\r
+  FRAMEWORK_EFI_IFR_ONE_OF_OPTION OneOfOption;\r
+  FRAMEWORK_EFI_IFR_END_ONE_OF    EndOneOf;\r

   CHAR16                CurrentLanguage[4];\r
   STRING_REF            StringToken;\r
 \r
   CHAR16                CurrentLanguage[4];\r
   STRING_REF            StringToken;\r
 \r


@@ -495,8 +495,8 @@ Returns:
     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r

-  OneOf.Header.OpCode = EFI_IFR_ONE_OF_OP;\r
-  OneOf.Header.Length = sizeof (EFI_IFR_ONE_OF);\r
+  OneOf.Header.OpCode = FRAMEWORK_EFI_IFR_ONE_OF_OP;\r
+  OneOf.Header.Length = sizeof (FRAMEWORK_EFI_IFR_ONE_OF);\r

   OneOf.QuestionId    = QuestionId;\r
   OneOf.Width         = DataWidth;\r
   OneOf.Prompt        = StringToken;\r
   OneOf.QuestionId    = QuestionId;\r
   OneOf.Width         = DataWidth;\r
   OneOf.Prompt        = StringToken;\r


@@ -519,8 +519,8 @@ Returns:
   }\r
 \r
   for (Index = 0; Index < OptionCount; Index++) {\r
   }\r
 \r
   for (Index = 0; Index < OptionCount; Index++) {\r

-    OneOfOption.Header.OpCode = EFI_IFR_ONE_OF_OPTION_OP;\r
-    OneOfOption.Header.Length = sizeof (EFI_IFR_ONE_OF_OPTION);\r
+    OneOfOption.Header.OpCode = FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP;\r
+    OneOfOption.Header.Length = sizeof (FRAMEWORK_EFI_IFR_ONE_OF_OPTION);\r

 \r
     //\r
     // Add string and get token back\r
 \r
     //\r
     // Add string and get token back\r


@@ -529,7 +529,7 @@ Returns:
 \r
     OneOfOption.Option  = StringToken;\r
     OneOfOption.Value   = OptionsList[Index].Value;\r
 \r
     OneOfOption.Option  = StringToken;\r
     OneOfOption.Value   = OptionsList[Index].Value;\r

-    OneOfOption.Flags   = (UINT8) (OptionsList[Index].Flags | EFI_IFR_FLAG_CREATED);\r
+    OneOfOption.Flags   = (UINT8) (OptionsList[Index].Flags | FRAMEWORK_EFI_IFR_FLAG_CREATED);\r

     OneOfOption.Key     = OptionsList[Index].Key;\r
 \r
     Status              = AddOpCode (FormBuffer, &OneOfOption);\r
     OneOfOption.Key     = OptionsList[Index].Key;\r
 \r
     Status              = AddOpCode (FormBuffer, &OneOfOption);\r


@@ -539,8 +539,8 @@ Returns:
     }\r
   }\r
 \r
     }\r
   }\r
 \r

-  EndOneOf.Header.Length  = sizeof (EFI_IFR_END_ONE_OF);\r
-  EndOneOf.Header.OpCode  = EFI_IFR_END_ONE_OF_OP;\r
+  EndOneOf.Header.Length  = sizeof (FRAMEWORK_EFI_IFR_END_ONE_OF);\r
+  EndOneOf.Header.OpCode  = FRAMEWORK_EFI_IFR_END_ONE_OF_OP;\r

 \r
   Status                  = AddOpCode (FormBuffer, &EndOneOf);\r
 \r
 \r
   Status                  = AddOpCode (FormBuffer, &EndOneOf);\r
 \r


@@ -595,9 +595,9 @@ Returns:
 {\r
   EFI_STATUS            Status;\r
   UINTN                 Index;\r
 {\r
   EFI_STATUS            Status;\r
   UINTN                 Index;\r

-  EFI_IFR_ORDERED_LIST  OrderedList;\r
-  EFI_IFR_ONE_OF_OPTION OrderedListOption;\r
-  EFI_IFR_END_ONE_OF    EndOrderedList;\r
+  FRAMEWORK_EFI_IFR_ORDERED_LIST  OrderedList;\r
+  FRAMEWORK_EFI_IFR_ONE_OF_OPTION OrderedListOption;\r
+  FRAMEWORK_EFI_IFR_END_ONE_OF    EndOrderedList;\r

   CHAR16                CurrentLanguage[4];\r
   STRING_REF            StringToken;\r
 \r
   CHAR16                CurrentLanguage[4];\r
   STRING_REF            StringToken;\r
 \r


@@ -615,8 +615,8 @@ Returns:
     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r

-  OrderedList.Header.OpCode = EFI_IFR_ORDERED_LIST_OP;\r
-  OrderedList.Header.Length = sizeof (EFI_IFR_ORDERED_LIST);\r
+  OrderedList.Header.OpCode = FRAMEWORK_EFI_IFR_ORDERED_LIST_OP;\r
+  OrderedList.Header.Length = sizeof (FRAMEWORK_EFI_IFR_ORDERED_LIST);\r

   OrderedList.QuestionId    = QuestionId;\r
   OrderedList.MaxEntries    = MaxEntries;\r
   OrderedList.Prompt        = StringToken;\r
   OrderedList.QuestionId    = QuestionId;\r
   OrderedList.MaxEntries    = MaxEntries;\r
   OrderedList.Prompt        = StringToken;\r


@@ -639,8 +639,8 @@ Returns:
   }\r
 \r
   for (Index = 0; Index < OptionCount; Index++) {\r
   }\r
 \r
   for (Index = 0; Index < OptionCount; Index++) {\r

-    OrderedListOption.Header.OpCode = EFI_IFR_ONE_OF_OPTION_OP;\r
-    OrderedListOption.Header.Length = sizeof (EFI_IFR_ONE_OF_OPTION);\r
+    OrderedListOption.Header.OpCode = FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP;\r
+    OrderedListOption.Header.Length = sizeof (FRAMEWORK_EFI_IFR_ONE_OF_OPTION);\r

 \r
     //\r
     // Add string and get token back\r
 \r
     //\r
     // Add string and get token back\r


@@ -649,7 +649,7 @@ Returns:
 \r
     OrderedListOption.Option  = StringToken;\r
     OrderedListOption.Value   = OptionsList[Index].Value;\r
 \r
     OrderedListOption.Option  = StringToken;\r
     OrderedListOption.Value   = OptionsList[Index].Value;\r

-    OrderedListOption.Flags   = (UINT8) (OptionsList[Index].Flags | EFI_IFR_FLAG_CREATED);\r
+    OrderedListOption.Flags   = (UINT8) (OptionsList[Index].Flags | FRAMEWORK_EFI_IFR_FLAG_CREATED);\r

     OrderedListOption.Key     = OptionsList[Index].Key;\r
 \r
     Status                    = AddOpCode (FormBuffer, &OrderedListOption);\r
     OrderedListOption.Key     = OptionsList[Index].Key;\r
 \r
     Status                    = AddOpCode (FormBuffer, &OrderedListOption);\r


@@ -659,8 +659,8 @@ Returns:
     }\r
   }\r
 \r
     }\r
   }\r
 \r

-  EndOrderedList.Header.Length  = sizeof (EFI_IFR_END_ONE_OF);\r
-  EndOrderedList.Header.OpCode  = EFI_IFR_END_ONE_OF_OP;\r
+  EndOrderedList.Header.Length  = sizeof (FRAMEWORK_EFI_IFR_END_ONE_OF);\r
+  EndOrderedList.Header.OpCode  = FRAMEWORK_EFI_IFR_END_ONE_OF_OP;\r

 \r
   Status                        = AddOpCode (FormBuffer, &EndOrderedList);\r
 \r
 \r
   Status                        = AddOpCode (FormBuffer, &EndOrderedList);\r
 \r


@@ -713,7 +713,7 @@ Returns:
 --*/\r
 {\r
   EFI_STATUS        Status;\r
 --*/\r
 {\r
   EFI_STATUS        Status;\r

-  EFI_IFR_CHECKBOX  CheckBox;\r
+  FRAMEWORK_EFI_IFR_CHECKBOX  CheckBox;\r

   CHAR16            CurrentLanguage[4];\r
   STRING_REF        StringToken;\r
 \r
   CHAR16            CurrentLanguage[4];\r
   STRING_REF        StringToken;\r
 \r


@@ -738,8 +738,8 @@ Returns:
     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r

-  CheckBox.Header.OpCode  = EFI_IFR_CHECKBOX_OP;\r
-  CheckBox.Header.Length  = sizeof (EFI_IFR_CHECKBOX);\r
+  CheckBox.Header.OpCode  = FRAMEWORK_EFI_IFR_CHECKBOX_OP;\r
+  CheckBox.Header.Length  = sizeof (FRAMEWORK_EFI_IFR_CHECKBOX);\r

   CheckBox.QuestionId     = QuestionId;\r
   CheckBox.Width          = DataWidth;\r
   CheckBox.Prompt         = StringToken;\r
   CheckBox.QuestionId     = QuestionId;\r
   CheckBox.Width          = DataWidth;\r
   CheckBox.Prompt         = StringToken;\r


@@ -754,7 +754,7 @@ Returns:
   }\r
 \r
   CheckBox.Help   = StringToken;\r
   }\r
 \r
   CheckBox.Help   = StringToken;\r

-  CheckBox.Flags  = (UINT8) (Flags | EFI_IFR_FLAG_CREATED);\r
+  CheckBox.Flags  = (UINT8) (Flags | FRAMEWORK_EFI_IFR_FLAG_CREATED);\r

 \r
   Status          = AddOpCode (FormBuffer, &CheckBox);\r
 \r
 \r
   Status          = AddOpCode (FormBuffer, &CheckBox);\r
 \r


@@ -822,7 +822,7 @@ Returns:
 --*/\r
 {\r
   EFI_STATUS      Status;\r
 --*/\r
 {\r
   EFI_STATUS      Status;\r

-  EFI_IFR_NUMERIC Numeric;\r
+  FRAMEWORK_EFI_IFR_NUMERIC Numeric;\r

   CHAR16          CurrentLanguage[4];\r
   STRING_REF      StringToken;\r
 \r
   CHAR16          CurrentLanguage[4];\r
   STRING_REF      StringToken;\r
 \r


@@ -847,8 +847,8 @@ Returns:
     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r

-  Numeric.Header.OpCode = EFI_IFR_NUMERIC_OP;\r
-  Numeric.Header.Length = sizeof (EFI_IFR_NUMERIC);\r
+  Numeric.Header.OpCode = FRAMEWORK_EFI_IFR_NUMERIC_OP;\r
+  Numeric.Header.Length = sizeof (FRAMEWORK_EFI_IFR_NUMERIC);\r

   Numeric.QuestionId    = QuestionId;\r
   Numeric.Width         = DataWidth;\r
   Numeric.Prompt        = StringToken;\r
   Numeric.QuestionId    = QuestionId;\r
   Numeric.Width         = DataWidth;\r
   Numeric.Prompt        = StringToken;\r


@@ -867,7 +867,7 @@ Returns:
   Numeric.Maximum = Maximum;\r
   Numeric.Step    = Step;\r
   Numeric.Default = Default;\r
   Numeric.Maximum = Maximum;\r
   Numeric.Step    = Step;\r
   Numeric.Default = Default;\r

-  Numeric.Flags   = (UINT8) (Flags | EFI_IFR_FLAG_CREATED);\r
+  Numeric.Flags   = (UINT8) (Flags | FRAMEWORK_EFI_IFR_FLAG_CREATED);\r

   Numeric.Key     = Key;\r
 \r
   Status          = AddOpCode (FormBuffer, &Numeric);\r
   Numeric.Key     = Key;\r
 \r
   Status          = AddOpCode (FormBuffer, &Numeric);\r


@@ -928,7 +928,7 @@ Returns:
 --*/\r
 {\r
   EFI_STATUS      Status;\r
 --*/\r
 {\r
   EFI_STATUS      Status;\r

-  EFI_IFR_STRING  String;\r
+  FRAMEWORK_EFI_IFR_STRING  String;\r

   CHAR16          CurrentLanguage[4];\r
   STRING_REF      StringToken;\r
 \r
   CHAR16          CurrentLanguage[4];\r
   STRING_REF      StringToken;\r
 \r


@@ -946,8 +946,8 @@ Returns:
     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r

-  String.Header.OpCode  = EFI_IFR_STRING_OP;\r
-  String.Header.Length  = sizeof (EFI_IFR_STRING);\r
+  String.Header.OpCode  = FRAMEWORK_EFI_IFR_STRING_OP;\r
+  String.Header.Length  = sizeof (FRAMEWORK_EFI_IFR_STRING);\r

   String.QuestionId     = QuestionId;\r
   String.Width          = DataWidth;\r
   String.Prompt         = StringToken;\r
   String.QuestionId     = QuestionId;\r
   String.Width          = DataWidth;\r
   String.Prompt         = StringToken;\r


@@ -964,7 +964,7 @@ Returns:
   String.Help     = StringToken;\r
   String.MinSize  = MinSize;\r
   String.MaxSize  = MaxSize;\r
   String.Help     = StringToken;\r
   String.MinSize  = MinSize;\r
   String.MaxSize  = MaxSize;\r

-  String.Flags    = (UINT8) (Flags | EFI_IFR_FLAG_CREATED);\r
+  String.Flags    = (UINT8) (Flags | FRAMEWORK_EFI_IFR_FLAG_CREATED);\r

   String.Key      = Key;\r
 \r
   Status          = AddOpCode (FormBuffer, &String);\r
   String.Key      = Key;\r
 \r
   Status          = AddOpCode (FormBuffer, &String);\r

diff --git a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOpCodeCreation.c b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOpCodeCreation.c
index 05b123887c1aac20fc83c6bc50e89ef56156fdb6..0e2405808132ae812e424ecc906af4a8a2168d1d 100644 (file)
--- a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOpCodeCreation.c
+++ b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOpCodeCreation.c
@@ -51,13 +51,13 @@ Returns:
 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r

-  EFI_IFR_SUBTITLE  Subtitle;\r
+  FRAMEWORK_EFI_IFR_SUBTITLE  Subtitle;\r

 \r
 \r

-  Subtitle.Header.OpCode  = EFI_IFR_SUBTITLE_OP;\r
-  Subtitle.Header.Length  = sizeof (EFI_IFR_SUBTITLE);\r
+  Subtitle.Header.OpCode  = FRAMEWORK_EFI_IFR_SUBTITLE_OP;\r
+  Subtitle.Header.Length  = sizeof (FRAMEWORK_EFI_IFR_SUBTITLE);\r

   Subtitle.SubTitle       = StringToken;\r
 \r
   Subtitle.SubTitle       = StringToken;\r
 \r

-  CopyMem (FormBuffer, &Subtitle, sizeof (EFI_IFR_SUBTITLE));\r
+  CopyMem (FormBuffer, &Subtitle, sizeof (FRAMEWORK_EFI_IFR_SUBTITLE));\r

   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r


@@ -100,10 +100,10 @@ Returns:
 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r

-  EFI_IFR_TEXT  Text;\r
+  FRAMEWORK_EFI_IFR_TEXT  Text;\r

 \r
 \r

-  Text.Header.OpCode  = EFI_IFR_TEXT_OP;\r
-  Text.Header.Length  = sizeof (EFI_IFR_TEXT);\r
+  Text.Header.OpCode  = FRAMEWORK_EFI_IFR_TEXT_OP;\r
+  Text.Header.Length  = sizeof (FRAMEWORK_EFI_IFR_TEXT);\r

   Text.Text           = StringToken;\r
 \r
   Text.TextTwo        = StringTokenTwo;\r
   Text.Text           = StringToken;\r
 \r
   Text.TextTwo        = StringTokenTwo;\r


@@ -111,7 +111,7 @@ Returns:
   Text.Flags          = Flags;\r
   Text.Key            = Key;\r
 \r
   Text.Flags          = Flags;\r
   Text.Key            = Key;\r
 \r

-  CopyMem (FormBuffer, &Text, sizeof (EFI_IFR_TEXT));\r
+  CopyMem (FormBuffer, &Text, sizeof (FRAMEWORK_EFI_IFR_TEXT));\r

 \r
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r


@@ -155,17 +155,17 @@ Returns:
 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r

-  EFI_IFR_REF Hyperlink;\r
+  FRAMEWORK_EFI_IFR_REF Hyperlink;\r

 \r
 \r

-  Hyperlink.Header.OpCode = EFI_IFR_REF_OP;\r
-  Hyperlink.Header.Length = sizeof (EFI_IFR_REF);\r
+  Hyperlink.Header.OpCode = FRAMEWORK_EFI_IFR_REF_OP;\r
+  Hyperlink.Header.Length = sizeof (FRAMEWORK_EFI_IFR_REF);\r

   Hyperlink.FormId        = FormId;\r
   Hyperlink.Prompt        = StringToken;\r
   Hyperlink.Help          = StringTokenTwo;\r
   Hyperlink.Key           = Key;\r
   Hyperlink.Flags         = Flags;\r
 \r
   Hyperlink.FormId        = FormId;\r
   Hyperlink.Prompt        = StringToken;\r
   Hyperlink.Help          = StringTokenTwo;\r
   Hyperlink.Key           = Key;\r
   Hyperlink.Flags         = Flags;\r
 \r

-  CopyMem (FormBuffer, &Hyperlink, sizeof (EFI_IFR_REF));\r
+  CopyMem (FormBuffer, &Hyperlink, sizeof (FRAMEWORK_EFI_IFR_REF));\r

 \r
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r


@@ -218,9 +218,9 @@ Returns:
 --*/\r
 {\r
   UINTN                 Index;\r
 --*/\r
 {\r
   UINTN                 Index;\r

-  EFI_IFR_ONE_OF        OneOf;\r
-  EFI_IFR_ONE_OF_OPTION OneOfOption;\r
-  EFI_IFR_END_ONE_OF    EndOneOf;\r
+  FRAMEWORK_EFI_IFR_ONE_OF        OneOf;\r
+  FRAMEWORK_EFI_IFR_ONE_OF_OPTION OneOfOption;\r
+  FRAMEWORK_EFI_IFR_END_ONE_OF    EndOneOf;\r

   UINT8                 *LocalBuffer;\r
 \r
   //\r
   UINT8                 *LocalBuffer;\r
 \r
   //\r


@@ -230,8 +230,8 @@ Returns:
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r

-  OneOf.Header.OpCode = EFI_IFR_ONE_OF_OP;\r
-  OneOf.Header.Length = sizeof (EFI_IFR_ONE_OF);\r
+  OneOf.Header.OpCode = FRAMEWORK_EFI_IFR_ONE_OF_OP;\r
+  OneOf.Header.Length = sizeof (FRAMEWORK_EFI_IFR_ONE_OF);\r

   OneOf.QuestionId    = QuestionId;\r
   OneOf.Width         = DataWidth;\r
   OneOf.Prompt        = PromptToken;\r
   OneOf.QuestionId    = QuestionId;\r
   OneOf.Width         = DataWidth;\r
   OneOf.Prompt        = PromptToken;\r


@@ -240,30 +240,30 @@ Returns:
 \r
   LocalBuffer         = (UINT8 *) FormBuffer;\r
 \r
 \r
   LocalBuffer         = (UINT8 *) FormBuffer;\r
 \r

-  CopyMem (LocalBuffer, &OneOf, sizeof (EFI_IFR_ONE_OF));\r
+  CopyMem (LocalBuffer, &OneOf, sizeof (FRAMEWORK_EFI_IFR_ONE_OF));\r

 \r
 \r

-  LocalBuffer = (UINT8 *) (LocalBuffer + sizeof (EFI_IFR_ONE_OF));\r
+  LocalBuffer = (UINT8 *) (LocalBuffer + sizeof (FRAMEWORK_EFI_IFR_ONE_OF));\r

 \r
   for (Index = 0; Index < OptionCount; Index++) {\r
 \r
   for (Index = 0; Index < OptionCount; Index++) {\r

-    OneOfOption.Header.OpCode = EFI_IFR_ONE_OF_OPTION_OP;\r
-    OneOfOption.Header.Length = sizeof (EFI_IFR_ONE_OF_OPTION);\r
+    OneOfOption.Header.OpCode = FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP;\r
+    OneOfOption.Header.Length = sizeof (FRAMEWORK_EFI_IFR_ONE_OF_OPTION);\r

 \r
     OneOfOption.Option        = OptionsList[Index].StringToken;\r
     OneOfOption.Value         = OptionsList[Index].Value;\r
     OneOfOption.Flags         = OptionsList[Index].Flags;\r
     OneOfOption.Key           = OptionsList[Index].Key;\r
 \r
 \r
     OneOfOption.Option        = OptionsList[Index].StringToken;\r
     OneOfOption.Value         = OptionsList[Index].Value;\r
     OneOfOption.Flags         = OptionsList[Index].Flags;\r
     OneOfOption.Key           = OptionsList[Index].Key;\r
 \r

-    CopyMem (LocalBuffer, &OneOfOption, sizeof (EFI_IFR_ONE_OF_OPTION));\r
+    CopyMem (LocalBuffer, &OneOfOption, sizeof (FRAMEWORK_EFI_IFR_ONE_OF_OPTION));\r

 \r
 \r

-    LocalBuffer = (UINT8 *) (LocalBuffer + sizeof (EFI_IFR_ONE_OF_OPTION));\r
+    LocalBuffer = (UINT8 *) (LocalBuffer + sizeof (FRAMEWORK_EFI_IFR_ONE_OF_OPTION));\r

   }\r
 \r
   }\r
 \r

-  EndOneOf.Header.Length  = sizeof (EFI_IFR_END_ONE_OF);\r
-  EndOneOf.Header.OpCode  = EFI_IFR_END_ONE_OF_OP;\r
+  EndOneOf.Header.Length  = sizeof (FRAMEWORK_EFI_IFR_END_ONE_OF);\r
+  EndOneOf.Header.OpCode  = FRAMEWORK_EFI_IFR_END_ONE_OF_OP;\r

 \r
 \r

-  CopyMem (LocalBuffer, &EndOneOf, sizeof (EFI_IFR_END_ONE_OF));\r
+  CopyMem (LocalBuffer, &EndOneOf, sizeof (FRAMEWORK_EFI_IFR_END_ONE_OF));\r

 \r
 \r

-  LocalBuffer = (UINT8 *) (LocalBuffer + sizeof (EFI_IFR_END_ONE_OF));\r
+  LocalBuffer = (UINT8 *) (LocalBuffer + sizeof (FRAMEWORK_EFI_IFR_END_ONE_OF));\r

 \r
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r


@@ -313,13 +313,13 @@ Returns:
 --*/\r
 {\r
   UINTN                 Index;\r
 --*/\r
 {\r
   UINTN                 Index;\r

-  EFI_IFR_ORDERED_LIST  OrderedList;\r
-  EFI_IFR_ONE_OF_OPTION OrderedListOption;\r
-  EFI_IFR_END_ONE_OF    EndOrderedList;\r
+  FRAMEWORK_EFI_IFR_ORDERED_LIST  OrderedList;\r
+  FRAMEWORK_EFI_IFR_ONE_OF_OPTION OrderedListOption;\r
+  FRAMEWORK_EFI_IFR_END_ONE_OF    EndOrderedList;\r

   UINT8                 *LocalBuffer;\r
 \r
   UINT8                 *LocalBuffer;\r
 \r

-  OrderedList.Header.OpCode = EFI_IFR_ORDERED_LIST_OP;\r
-  OrderedList.Header.Length = sizeof (EFI_IFR_ORDERED_LIST);\r
+  OrderedList.Header.OpCode = FRAMEWORK_EFI_IFR_ORDERED_LIST_OP;\r
+  OrderedList.Header.Length = sizeof (FRAMEWORK_EFI_IFR_ORDERED_LIST);\r

   OrderedList.QuestionId    = QuestionId;\r
   OrderedList.MaxEntries    = MaxEntries;\r
   OrderedList.Prompt        = PromptToken;\r
   OrderedList.QuestionId    = QuestionId;\r
   OrderedList.MaxEntries    = MaxEntries;\r
   OrderedList.Prompt        = PromptToken;\r


@@ -328,30 +328,30 @@ Returns:
 \r
   LocalBuffer               = (UINT8 *) FormBuffer;\r
 \r
 \r
   LocalBuffer               = (UINT8 *) FormBuffer;\r
 \r

-  CopyMem (LocalBuffer, &OrderedList, sizeof (EFI_IFR_ORDERED_LIST));\r
+  CopyMem (LocalBuffer, &OrderedList, sizeof (FRAMEWORK_EFI_IFR_ORDERED_LIST));\r

 \r
 \r

-  LocalBuffer = (UINT8 *) (LocalBuffer + sizeof (EFI_IFR_ORDERED_LIST));\r
+  LocalBuffer = (UINT8 *) (LocalBuffer + sizeof (FRAMEWORK_EFI_IFR_ORDERED_LIST));\r

 \r
   for (Index = 0; Index < OptionCount; Index++) {\r
 \r
   for (Index = 0; Index < OptionCount; Index++) {\r

-    OrderedListOption.Header.OpCode = EFI_IFR_ONE_OF_OPTION_OP;\r
-    OrderedListOption.Header.Length = sizeof (EFI_IFR_ONE_OF_OPTION);\r
+    OrderedListOption.Header.OpCode = FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP;\r
+    OrderedListOption.Header.Length = sizeof (FRAMEWORK_EFI_IFR_ONE_OF_OPTION);\r

 \r
     OrderedListOption.Option        = OptionsList[Index].StringToken;\r
     OrderedListOption.Value         = OptionsList[Index].Value;\r
     OrderedListOption.Flags         = OptionsList[Index].Flags;\r
     OrderedListOption.Key           = OptionsList[Index].Key;\r
 \r
 \r
     OrderedListOption.Option        = OptionsList[Index].StringToken;\r
     OrderedListOption.Value         = OptionsList[Index].Value;\r
     OrderedListOption.Flags         = OptionsList[Index].Flags;\r
     OrderedListOption.Key           = OptionsList[Index].Key;\r
 \r

-    CopyMem (LocalBuffer, &OrderedListOption, sizeof (EFI_IFR_ONE_OF_OPTION));\r
+    CopyMem (LocalBuffer, &OrderedListOption, sizeof (FRAMEWORK_EFI_IFR_ONE_OF_OPTION));\r

 \r
 \r

-    LocalBuffer = (UINT8 *) (LocalBuffer + sizeof (EFI_IFR_ONE_OF_OPTION));\r
+    LocalBuffer = (UINT8 *) (LocalBuffer + sizeof (FRAMEWORK_EFI_IFR_ONE_OF_OPTION));\r

   }\r
 \r
   }\r
 \r

-  EndOrderedList.Header.Length  = sizeof (EFI_IFR_END_ONE_OF);\r
-  EndOrderedList.Header.OpCode  = EFI_IFR_END_ONE_OF_OP;\r
+  EndOrderedList.Header.Length  = sizeof (FRAMEWORK_EFI_IFR_END_ONE_OF);\r
+  EndOrderedList.Header.OpCode  = FRAMEWORK_EFI_IFR_END_ONE_OF_OP;\r

 \r
 \r

-  CopyMem (LocalBuffer, &EndOrderedList, sizeof (EFI_IFR_END_ONE_OF));\r
+  CopyMem (LocalBuffer, &EndOrderedList, sizeof (FRAMEWORK_EFI_IFR_END_ONE_OF));\r

 \r
 \r

-  LocalBuffer = (UINT8 *) (LocalBuffer + sizeof (EFI_IFR_END_ONE_OF));\r
+  LocalBuffer = (UINT8 *) (LocalBuffer + sizeof (FRAMEWORK_EFI_IFR_END_ONE_OF));\r

 \r
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r


@@ -399,7 +399,7 @@ Returns:
 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r

-  EFI_IFR_CHECKBOX  CheckBox;\r
+  FRAMEWORK_EFI_IFR_CHECKBOX  CheckBox;\r

 \r
   //\r
   // We do not create op-code storage widths for checkbox in excess of 8 bits for now\r
 \r
   //\r
   // We do not create op-code storage widths for checkbox in excess of 8 bits for now\r


@@ -408,8 +408,8 @@ Returns:
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r

-  CheckBox.Header.OpCode  = EFI_IFR_CHECKBOX_OP;\r
-  CheckBox.Header.Length  = sizeof (EFI_IFR_CHECKBOX);\r
+  CheckBox.Header.OpCode  = FRAMEWORK_EFI_IFR_CHECKBOX_OP;\r
+  CheckBox.Header.Length  = sizeof (FRAMEWORK_EFI_IFR_CHECKBOX);\r

   CheckBox.QuestionId     = QuestionId;\r
   CheckBox.Width          = DataWidth;\r
   CheckBox.Prompt         = PromptToken;\r
   CheckBox.QuestionId     = QuestionId;\r
   CheckBox.Width          = DataWidth;\r
   CheckBox.Prompt         = PromptToken;\r


@@ -418,7 +418,7 @@ Returns:
   CheckBox.Flags          = Flags;\r
   CheckBox.Key            = Key;\r
 \r
   CheckBox.Flags          = Flags;\r
   CheckBox.Key            = Key;\r
 \r

-  CopyMem (FormBuffer, &CheckBox, sizeof (EFI_IFR_CHECKBOX));\r
+  CopyMem (FormBuffer, &CheckBox, sizeof (FRAMEWORK_EFI_IFR_CHECKBOX));\r

 \r
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r


@@ -479,7 +479,7 @@ Returns:
 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r

-  EFI_IFR_NUMERIC Numeric;\r
+  FRAMEWORK_EFI_IFR_NUMERIC Numeric;\r

 \r
   //\r
   // We do not create op-code storage widths for numerics in excess of 16 bits for now\r
 \r
   //\r
   // We do not create op-code storage widths for numerics in excess of 16 bits for now\r


@@ -488,8 +488,8 @@ Returns:
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r

-  Numeric.Header.OpCode = EFI_IFR_NUMERIC_OP;\r
-  Numeric.Header.Length = sizeof (EFI_IFR_NUMERIC);\r
+  Numeric.Header.OpCode = FRAMEWORK_EFI_IFR_NUMERIC_OP;\r
+  Numeric.Header.Length = sizeof (FRAMEWORK_EFI_IFR_NUMERIC);\r

   Numeric.QuestionId    = QuestionId;\r
   Numeric.Width         = DataWidth;\r
   Numeric.Prompt        = PromptToken;\r
   Numeric.QuestionId    = QuestionId;\r
   Numeric.Width         = DataWidth;\r
   Numeric.Prompt        = PromptToken;\r


@@ -502,7 +502,7 @@ Returns:
   Numeric.Flags         = Flags;\r
   Numeric.Key           = Key;\r
 \r
   Numeric.Flags         = Flags;\r
   Numeric.Key           = Key;\r
 \r

-  CopyMem (FormBuffer, &Numeric, sizeof (EFI_IFR_NUMERIC));\r
+  CopyMem (FormBuffer, &Numeric, sizeof (FRAMEWORK_EFI_IFR_NUMERIC));\r

 \r
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r


@@ -555,10 +555,10 @@ Returns:
 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r

-  EFI_IFR_STRING  String;\r
+  FRAMEWORK_EFI_IFR_STRING  String;\r

 \r
 \r

-  String.Header.OpCode  = EFI_IFR_STRING_OP;\r
-  String.Header.Length  = sizeof (EFI_IFR_STRING);\r
+  String.Header.OpCode  = FRAMEWORK_EFI_IFR_STRING_OP;\r
+  String.Header.Length  = sizeof (FRAMEWORK_EFI_IFR_STRING);\r

   String.QuestionId     = QuestionId;\r
   String.Width          = DataWidth;\r
   String.Prompt         = PromptToken;\r
   String.QuestionId     = QuestionId;\r
   String.Width          = DataWidth;\r
   String.Prompt         = PromptToken;\r


@@ -569,7 +569,7 @@ Returns:
   String.Flags          = Flags;\r
   String.Key            = Key;\r
 \r
   String.Flags          = Flags;\r
   String.Key            = Key;\r
 \r

-  CopyMem (FormBuffer, &String, sizeof (EFI_IFR_STRING));\r
+  CopyMem (FormBuffer, &String, sizeof (FRAMEWORK_EFI_IFR_STRING));\r

 \r
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r


@@ -604,15 +604,15 @@ Returns:
 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r

-  EFI_IFR_BANNER  Banner;\r
+  FRAMEWORK_EFI_IFR_BANNER  Banner;\r

 \r
 \r

-  Banner.Header.OpCode  = EFI_IFR_BANNER_OP;\r
-  Banner.Header.Length  = sizeof (EFI_IFR_BANNER);\r
+  Banner.Header.OpCode  = FRAMEWORK_EFI_IFR_BANNER_OP;\r
+  Banner.Header.Length  = sizeof (FRAMEWORK_EFI_IFR_BANNER);\r

   CopyMem (&Banner.Title, &Title, sizeof (UINT16));\r
   CopyMem (&Banner.LineNumber, &LineNumber, sizeof (UINT16));\r
   Banner.Alignment = Alignment;\r
 \r
   CopyMem (&Banner.Title, &Title, sizeof (UINT16));\r
   CopyMem (&Banner.LineNumber, &LineNumber, sizeof (UINT16));\r
   Banner.Alignment = Alignment;\r
 \r

-  CopyMem (FormBuffer, &Banner, sizeof (EFI_IFR_BANNER));\r
+  CopyMem (FormBuffer, &Banner, sizeof (FRAMEWORK_EFI_IFR_BANNER));\r

 \r
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r

diff --git a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLibInternal.h b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLibInternal.h
index 033b3969dacb0b0d485885ff610e81de66a01100..8dce61bd9a84027f0725097e2b2909c1bf0b3774 100644 (file)
--- a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLibInternal.h
+++ b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrSupportLibInternal.h
@@ -15,9 +15,7 @@
 #ifndef __IFRSUPPORT_LIB_INTERNAL_H_\r
 #define __IFRSUPPORT_LIB_INTERNAL_H_\r
 \r
 #ifndef __IFRSUPPORT_LIB_INTERNAL_H_\r
 #define __IFRSUPPORT_LIB_INTERNAL_H_\r
 \r

-\r
-\r
-#include <PiDxe.h>\r
+#include <FrameworkDxe.h>\r

 \r
 #include <Guid/GlobalVariable.h>\r
 #include <Protocol/FrameworkHii.h>\r
 \r
 #include <Guid/GlobalVariable.h>\r
 #include <Protocol/FrameworkHii.h>\r