#define FRAMEWORK_EFI_IFR_FORM_OP 0x01\r
#define FRAMEWORK_EFI_IFR_SUBTITLE_OP 0x02\r
#define FRAMEWORK_EFI_IFR_TEXT_OP 0x03\r
-#define FRAMEWORK_EFI_IFR_GRAPHIC_OP 0x04\r
+#define EFI_IFR_GRAPHIC_OP 0x04\r
#define FRAMEWORK_EFI_IFR_ONE_OF_OP 0x05\r
#define FRAMEWORK_EFI_IFR_CHECKBOX_OP 0x06\r
#define FRAMEWORK_EFI_IFR_NUMERIC_OP 0x07\r
#define FRAMEWORK_EFI_IFR_PASSWORD_OP 0x08\r
#define FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP 0x09 ///< ONEOF OPTION field\r
#define FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP 0x0A\r
-#define FRAMEWORK_EFI_IFR_END_FORM_OP 0x0B\r
-#define FRAMEWORK_EFI_IFR_HIDDEN_OP 0x0C\r
-#define FRAMEWORK_EFI_IFR_END_FORM_SET_OP 0x0D\r
+#define EFI_IFR_END_FORM_OP 0x0B\r
+#define EFI_IFR_HIDDEN_OP 0x0C\r
+#define EFI_IFR_END_FORM_SET_OP 0x0D\r
#define FRAMEWORK_EFI_IFR_FORM_SET_OP 0x0E\r
#define FRAMEWORK_EFI_IFR_REF_OP 0x0F\r
-#define FRAMEWORK_EFI_IFR_END_ONE_OF_OP 0x10\r
-#define FRAMEWORK_EFI_IFR_END_OP FRAMEWORK_EFI_IFR_END_ONE_OF_OP\r
+#define EFI_IFR_END_ONE_OF_OP 0x10\r
+#define FRAMEWORK_EFI_IFR_END_OP EFI_IFR_END_ONE_OF_OP\r
#define FRAMEWORK_EFI_IFR_INCONSISTENT_IF_OP 0x11\r
#define FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP 0x12\r
#define FRAMEWORK_EFI_IFR_EQ_ID_ID_OP 0x13\r
#define FRAMEWORK_EFI_IFR_AND_OP 0x15\r
#define FRAMEWORK_EFI_IFR_OR_OP 0x16\r
#define FRAMEWORK_EFI_IFR_NOT_OP 0x17\r
-#define FRAMEWORK_EFI_IFR_END_IF_OP 0x18 ///< for endif of inconsistentif, suppressif, grayoutif\r
-#define FRAMEWORK_EFI_IFR_GRAYOUT_IF_OP 0x19\r
+#define EFI_IFR_END_IF_OP 0x18 ///< for endif of inconsistentif, suppressif, grayoutif\r
+#define EFI_IFR_GRAYOUT_IF_OP 0x19\r
#define FRAMEWORK_EFI_IFR_DATE_OP 0x1A\r
#define FRAMEWORK_EFI_IFR_TIME_OP 0x1B\r
#define FRAMEWORK_EFI_IFR_STRING_OP 0x1C\r
-#define FRAMEWORK_EFI_IFR_LABEL_OP 0x1D\r
-#define FRAMEWORK_EFI_IFR_SAVE_DEFAULTS_OP 0x1E\r
-#define FRAMEWORK_EFI_IFR_RESTORE_DEFAULTS_OP 0x1F\r
-#define FRAMEWORK_EFI_IFR_BANNER_OP 0x20\r
-#define FRAMEWORK_EFI_IFR_INVENTORY_OP 0x21\r
-#define FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP 0x22\r
+#define EFI_IFR_LABEL_OP 0x1D\r
+#define EFI_IFR_SAVE_DEFAULTS_OP 0x1E\r
+#define EFI_IFR_RESTORE_DEFAULTS_OP 0x1F\r
+#define EFI_IFR_BANNER_OP 0x20\r
+#define EFI_IFR_INVENTORY_OP 0x21\r
+#define EFI_IFR_EQ_VAR_VAL_OP 0x22\r
#define FRAMEWORK_EFI_IFR_ORDERED_LIST_OP 0x23\r
#define FRAMEWORK_EFI_IFR_VARSTORE_OP 0x24\r
-#define FRAMEWORK_EFI_IFR_VARSTORE_SELECT_OP 0x25\r
-#define FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR_OP 0x26\r
-#define FRAMEWORK_EFI_IFR_LAST_OPCODE FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR_OP\r
-#define FRAMEWORK_EFI_IFR_OEM_OP 0xFE\r
-#define FRAMEWORK_EFI_IFR_NV_ACCESS_COMMAND 0xFF\r
+#define EFI_IFR_VARSTORE_SELECT_OP 0x25\r
+#define EFI_IFR_VARSTORE_SELECT_PAIR_OP 0x26\r
+#define EFI_IFR_LAST_OPCODE EFI_IFR_VARSTORE_SELECT_PAIR_OP\r
+#define EFI_IFR_OEM_OP 0xFE\r
+#define EFI_IFR_NV_ACCESS_COMMAND 0xFF\r
\r
//\r
// Define values for the flags fields in some VFR opcodes. These are\r
// bitmasks.\r
//\r
-#define FRAMEWORK_EFI_IFR_FLAG_DEFAULT 0x01\r
-#define FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING 0x02\r
-#define FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE 0x04\r
-#define FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS 0x08\r
-#define FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED 0x10\r
-#define FRAMEWORK_EFI_IFR_FLAG_LATE_CHECK 0x20\r
+#define EFI_IFR_FLAG_DEFAULT 0x01\r
+#define EFI_IFR_FLAG_MANUFACTURING 0x02\r
+#define EFI_IFR_FLAG_INTERACTIVE 0x04\r
+#define EFI_IFR_FLAG_NV_ACCESS 0x08\r
+#define EFI_IFR_FLAG_RESET_REQUIRED 0x10\r
+#define EFI_IFR_FLAG_LATE_CHECK 0x20\r
\r
#define EFI_NON_DEVICE_CLASS 0x00 ///< Useful when you do not want something in the Device Manager\r
#define EFI_DISK_DEVICE_CLASS 0x01\r
/// data will be saved, ensure that the NV starting location they refer to is pre-defined in the\r
/// NV map.\r
///\r
-#define FRAMEWORK_EFI_IFR_FLAG_CREATED 128\r
+#define EFI_IFR_FLAG_CREATED 128\r
\r
\r
#pragma pack(1)\r
typedef struct {\r
FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
UINT16 LabelId;\r
-} FRAMEWORK_EFI_IFR_LABEL;\r
+} EFI_IFR_LABEL;\r
\r
typedef struct {\r
FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
\r
typedef struct {\r
FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-} FRAMEWORK_EFI_IFR_END_FORM;\r
+} EFI_IFR_END_FORM;\r
\r
typedef struct {\r
FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-} FRAMEWORK_EFI_IFR_END_FORM_SET;\r
+} EFI_IFR_END_FORM_SET;\r
\r
//\r
// Also notice that the IFR_ONE_OF and IFR_CHECK_BOX are identical in structure......\r
STRING_REF Help; ///< The string Token for the context-help\r
UINT8 Flags; ///< If non-zero, means that it is the default option\r
UINT16 Key; ///< Value to be passed to caller to identify this particular op-code\r
-} FRAMEWORK_EFI_IFR_CHECKBOX, FRAMEWORK_EFI_IFR_CHECK_BOX;\r
+} FRAMEWORK_EFI_IFR_CHECKBOX, EFI_IFR_CHECK_BOX;\r
\r
typedef struct {\r
FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
\r
typedef struct {\r
FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-} FRAMEWORK_EFI_IFR_END_ONE_OF;\r
+} EFI_IFR_END_ONE_OF;\r
\r
typedef struct {\r
FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
UINT16 Value;\r
UINT16 Key;\r
-} FRAMEWORK_EFI_IFR_HIDDEN;\r
+} EFI_IFR_HIDDEN;\r
\r
///\r
/// Inconsistent with specification here:\r
typedef struct {\r
FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
UINT8 Flags;\r
-} FRAMEWORK_EFI_IFR_SUPPRESS;\r
+} EFI_IFR_SUPPRESS;\r
\r
typedef struct {\r
FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
UINT8 Flags;\r
-} FRAMEWORK_EFI_IFR_GRAY_OUT;\r
+} EFI_IFR_GRAY_OUT;\r
\r
typedef struct {\r
FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
STRING_REF Popup;\r
UINT8 Flags;\r
-} FRAMEWORK_EFI_IFR_INCONSISTENT;\r
+} EFI_IFR_INCONSISTENT;\r
\r
typedef struct {\r
FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
UINT16 VariableId; ///< offset into variable storage\r
UINT16 Value; ///< value to compare against\r
-} FRAMEWORK_EFI_IFR_EQ_VAR_VAL;\r
+} EFI_IFR_EQ_VAR_VAL;\r
\r
typedef struct {\r
FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
\r
typedef struct {\r
FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
-} FRAMEWORK_EFI_IFR_END_EXPR, FRAMEWORK_EFI_IFR_END_IF;\r
+} EFI_IFR_END_EXPR, EFI_IFR_END_IF;\r
\r
typedef struct {\r
FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
STRING_REF Help;\r
UINT8 Flags;\r
UINT16 Key;\r
-} FRAMEWORK_EFI_IFR_SAVE_DEFAULTS;\r
+} EFI_IFR_SAVE_DEFAULTS;\r
\r
typedef struct {\r
FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
STRING_REF Help;\r
STRING_REF Text;\r
STRING_REF TextTwo; ///< optional text\r
-} FRAMEWORK_EFI_IFR_INVENTORY;\r
+} EFI_IFR_INVENTORY;\r
\r
typedef struct {\r
FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
typedef struct {\r
FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
UINT16 VarId; ///< variable store ID, as referenced elsewhere in the form\r
-} FRAMEWORK_EFI_IFR_VARSTORE_SELECT;\r
+} EFI_IFR_VARSTORE_SELECT;\r
\r
///\r
/// Used for the ideqid VFR statement where two variable stores may be referenced in the\r
FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
UINT16 VarId; ///< variable store ID, as referenced elsewhere in the form\r
UINT16 SecondaryVarId; ///< variable store ID, as referenced elsewhere in the form\r
-} FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR;\r
+} EFI_IFR_VARSTORE_SELECT_PAIR;\r
\r
///\r
/// Save defaults and restore defaults have same structure\r
///\r
-#define FRAMEWORK_EFI_IFR_RESTORE_DEFAULTS FRAMEWORK_EFI_IFR_SAVE_DEFAULTS\r
+#define EFI_IFR_RESTORE_DEFAULTS EFI_IFR_SAVE_DEFAULTS\r
\r
typedef struct {\r
FRAMEWORK_EFI_IFR_OP_HEADER Header;\r
STRING_REF Title; ///< The string token for the banner title\r
UINT16 LineNumber; ///< 1-based line number\r
UINT8 Alignment; ///< left, center, or right-aligned\r
-} FRAMEWORK_EFI_IFR_BANNER;\r
+} EFI_IFR_BANNER;\r
\r
-#define FRAMEWORK_EFI_IFR_BANNER_ALIGN_LEFT 0\r
-#define FRAMEWORK_EFI_IFR_BANNER_ALIGN_CENTER 1\r
-#define FRAMEWORK_EFI_IFR_BANNER_ALIGN_RIGHT 2\r
-#define FRAMEWORK_EFI_IFR_BANNER_TIMEOUT 0xFF\r
+#define EFI_IFR_BANNER_ALIGN_LEFT 0\r
+#define EFI_IFR_BANNER_ALIGN_CENTER 1\r
+#define EFI_IFR_BANNER_ALIGN_RIGHT 2\r
+#define EFI_IFR_BANNER_TIMEOUT 0xFF\r
\r
#pragma pack()\r
\r