\r
#include <Framework/DxeCis.h>\r
\r
+#include <Framework/FrameworkInternalFormRepresentation.h>\r
+\r
#endif\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
} 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
\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
+// 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
\r
-\r
-\r
#endif\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
--*/\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
\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
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
(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 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
#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
#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
- // 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
-} 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
- UINT32 EntryCount; // How many EFI_IFR_DATA_ENTRY entries\r
+ UINT32 EntryCount; // How many FRAMEWORK_EFI_IFR_DATA_ENTRY entries\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
-} EFI_IFR_DATA_ARRAY;\r
+} FRAMEWORK_EFI_IFR_DATA_ARRAY;\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_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
-} EFI_IFR_NV_DATA;\r
+} FRAMEWORK_EFI_IFR_NV_DATA;\r
\r
#pragma pack()\r
//\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
\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
//\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
//\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
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
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
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
\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
(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
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
@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
(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
- @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
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
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
(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
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
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
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
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
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
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
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
@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
(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
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
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
\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
+#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
VA_LIST Args;\r
- EFI_HII_PACKAGES *HiiPackages;\r
- VOID **Package;\r
- UINTN Index;\r
\r
- ASSERT (NumberOfPackages > 0);\r
+ VA_START (Args, Guid);\r
\r
- HiiPackages = AllocateZeroPool (sizeof (EFI_HII_PACKAGES) + NumberOfPackages * sizeof (VOID *));\r
- ASSERT (HiiPackages != NULL);\r
+ return InternalPreparePackages (NumberOfPackages, Guid, Args);\r
+}\r
\r
- HiiPackages->GuidId = (EFI_GUID *) Guid;\r
- HiiPackages->NumberOfPackages = NumberOfPackages;\r
- Package = (VOID **) (((UINT8 *) HiiPackages) + sizeof (EFI_HII_PACKAGES));\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
- 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
- VA_END (Args);\r
+ FreePool (FrameworkHiiPacages);\r
+ \r
+ return Status;\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
+ return Status; \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
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
+ CONSTRUCTOR = FrameworkHiiLibConstructor\r
+\r
\r
#\r
# The following information is for reference only and not required by the build tools.\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
// 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
- 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
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
//\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
- 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
- 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
- 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
- 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
- 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
// 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
- 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
- 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
- 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
- case EFI_IFR_NUMERIC_OP:\r
+ case FRAMEWORK_EFI_IFR_NUMERIC_OP:\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
}\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
{\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
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
EFI_STATUS\r
ValidateDataFromHiiHandle (\r
- IN EFI_HII_HANDLE HiiHandle,\r
+ IN FRAMEWORK_EFI_HII_HANDLE HiiHandle,\r
OUT BOOLEAN *Results\r
)\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
- 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
- case EFI_IFR_FORM_SET_OP:\r
+ case FRAMEWORK_EFI_IFR_FORM_SET_OP:\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
- 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
- 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
// 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
- 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
- CachedStart = ((EFI_IFR_ONE_OF *) &RawData[Index])->QuestionId;\r
+ CachedStart = ((FRAMEWORK_EFI_IFR_ONE_OF *) &RawData[Index])->QuestionId;\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
- 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
- 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
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
- 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
- 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
return EFI_SUCCESS;\r
}\r
\r
+\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
//\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
- 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
//\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 = 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
- Destination = Destination + sizeof (EFI_IFR_FORM_SET);\r
+ Destination = Destination + sizeof (FRAMEWORK_EFI_IFR_FORM_SET);\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
--*/\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
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
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
{\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
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
--*/\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
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
\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
--*/\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
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
{\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
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
}\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
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
}\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
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
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
}\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
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
}\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
{\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
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
}\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
{\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
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.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
--*/\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
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.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
\r
--*/\r
{\r
- EFI_IFR_SUBTITLE Subtitle;\r
+ FRAMEWORK_EFI_IFR_SUBTITLE Subtitle;\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
- CopyMem (FormBuffer, &Subtitle, sizeof (EFI_IFR_SUBTITLE));\r
+ CopyMem (FormBuffer, &Subtitle, sizeof (FRAMEWORK_EFI_IFR_SUBTITLE));\r
return EFI_SUCCESS;\r
}\r
\r
\r
--*/\r
{\r
- EFI_IFR_TEXT Text;\r
+ FRAMEWORK_EFI_IFR_TEXT Text;\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.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
--*/\r
{\r
- EFI_IFR_REF Hyperlink;\r
+ FRAMEWORK_EFI_IFR_REF Hyperlink;\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
- CopyMem (FormBuffer, &Hyperlink, sizeof (EFI_IFR_REF));\r
+ CopyMem (FormBuffer, &Hyperlink, sizeof (FRAMEWORK_EFI_IFR_REF));\r
\r
return EFI_SUCCESS;\r
}\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
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
\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
- 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
- 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
- CopyMem (LocalBuffer, &OneOfOption, sizeof (EFI_IFR_ONE_OF_OPTION));\r
+ CopyMem (LocalBuffer, &OneOfOption, sizeof (FRAMEWORK_EFI_IFR_ONE_OF_OPTION));\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
- 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
- CopyMem (LocalBuffer, &EndOneOf, sizeof (EFI_IFR_END_ONE_OF));\r
+ CopyMem (LocalBuffer, &EndOneOf, sizeof (FRAMEWORK_EFI_IFR_END_ONE_OF));\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
{\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
- 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
\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
- 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
- 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
- CopyMem (LocalBuffer, &OrderedListOption, sizeof (EFI_IFR_ONE_OF_OPTION));\r
+ CopyMem (LocalBuffer, &OrderedListOption, sizeof (FRAMEWORK_EFI_IFR_ONE_OF_OPTION));\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
- 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
- CopyMem (LocalBuffer, &EndOrderedList, sizeof (EFI_IFR_END_ONE_OF));\r
+ CopyMem (LocalBuffer, &EndOrderedList, sizeof (FRAMEWORK_EFI_IFR_END_ONE_OF));\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
--*/\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
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.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
--*/\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
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.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
--*/\r
{\r
- EFI_IFR_STRING String;\r
+ FRAMEWORK_EFI_IFR_STRING String;\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.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
--*/\r
{\r
- EFI_IFR_BANNER Banner;\r
+ FRAMEWORK_EFI_IFR_BANNER Banner;\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 (FormBuffer, &Banner, sizeof (EFI_IFR_BANNER));\r
+ CopyMem (FormBuffer, &Banner, sizeof (FRAMEWORK_EFI_IFR_BANNER));\r
\r
return EFI_SUCCESS;\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