X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=IntelFrameworkPkg%2FInclude%2FProtocol%2FFrameworkFormCallback.h;h=c544deca89c2efb0472cd4038214817903c8b3f6;hp=12aed7dc909630597d80b46301cb7f3a48b66caf;hb=dc7b4a5c436c3190fca6607e77711c3246d7290a;hpb=c03fbe30c1870c9f235eb101cba15e25c1fdd005

diff --git a/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h b/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h
index 12aed7dc90..c544deca89 100644
--- a/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h
+++ b/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h
@@ -24,7 +24,7 @@
 #ifndef __FORM_CALLBACK_H__
 #define __FORM_CALLBACK_H__
 
-#include <PiDxe.h>
+#include <FrameworkDxe.h>
 
 #include <Protocol/FrameworkHii.h>
 #include <Protocol/FrameworkFormBrowser.h>
@@ -50,41 +50,41 @@ typedef struct _EFI_FORM_CALLBACK_PROTOCOL  EFI_FORM_CALLBACK_PROTOCOL;
 #pragma pack(1)
 typedef struct {
   UINT8   OpCode;           // Likely a string, numeric, or one-of
-  UINT8   Length;           // Length of the EFI_IFR_DATA_ENTRY packet
+  UINT8   Length;           // Length of the FRAMEWORK_EFI_IFR_DATA_ENTRY packet
   UINT16  Flags;            // Flags settings to determine what behavior is desired from the browser after the callback
   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
   // If the OpCode is a OneOf or Numeric type - Data is a UINT16 value
   // If the OpCode is a String type - Data is a CHAR16[x] type
   // If the OpCode is a Checkbox type - Data is a UINT8 value
-  // If the OpCode is a NV Access type - Data is a EFI_IFR_NV_DATA structure
+  // If the OpCode is a NV Access type - Data is a FRAMEWORK_EFI_IFR_NV_DATA structure
   //
-} EFI_IFR_DATA_ENTRY;
+} FRAMEWORK_EFI_IFR_DATA_ENTRY;
 
 typedef struct {
   VOID                *NvRamMap;  // If the flag of the op-code specified retrieval of a copy of the NVRAM map,
   // this is a pointer to a buffer copy
   //
-  UINT32              EntryCount; // How many EFI_IFR_DATA_ENTRY entries
+  UINT32              EntryCount; // How many FRAMEWORK_EFI_IFR_DATA_ENTRY entries
   //
-  // EFI_IFR_DATA_ENTRY  Data[1];    // The in-line Data entries.
+  // FRAMEWORK_EFI_IFR_DATA_ENTRY  Data[1];    // The in-line Data entries.
   //
-} EFI_IFR_DATA_ARRAY;
+} FRAMEWORK_EFI_IFR_DATA_ARRAY;
 
 
 typedef union {
-  EFI_IFR_DATA_ARRAY  DataArray;  // Primarily used by those who call back to their drivers and use HII as a repository
-  EFI_IFR_PACKET      DataPacket; // Primarily used by those which do not use HII as a repository
-  CHAR16              *String;  // If returning an error - fill the string with null-terminated contents
+  FRAMEWORK_EFI_IFR_DATA_ARRAY  DataArray;  // Primarily used by those who call back to their drivers and use HII as a repository
+  FRAMEWORK_EFI_IFR_PACKET      DataPacket; // Primarily used by those which do not use HII as a repository
+  CHAR16                        String[1];  // If returning an error - fill the string with null-terminated contents
 } EFI_HII_CALLBACK_PACKET;
 
 typedef struct {
-  EFI_IFR_OP_HEADER Header;
+  FRAMEWORK_EFI_IFR_OP_HEADER Header;
   UINT16            QuestionId;   // Offset into the map
   UINT8             StorageWidth; // Width of the value
   //
   // CHAR8             Data[1];      // The Data itself
   //
-} EFI_IFR_NV_DATA;
+} FRAMEWORK_EFI_IFR_NV_DATA;
 
 #pragma pack()
 //
@@ -178,7 +178,7 @@ EFI_STATUS
 (EFIAPI *EFI_FORM_CALLBACK) (
   IN     EFI_FORM_CALLBACK_PROTOCOL    *This,
   IN     UINT16                        KeyValue,
-  IN     EFI_IFR_DATA_ARRAY            *Data,
+  IN     FRAMEWORK_EFI_IFR_DATA_ARRAY            *Data,
   OUT    EFI_HII_CALLBACK_PACKET       **Packet
   );