UEFI HII: Merge UEFI HII support changes from branch.

[mirror_edk2.git] / IntelFrameworkPkg / Include / Protocol / FrameworkFormCallback.h

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
-#include <PiDxe.h>\r
+#include <FrameworkDxe.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
-  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
@@ -178,7 +178,7 @@ EFI_STATUS
 (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