UEFI HII: Merge UEFI HII support changes from branch.

[mirror_edk2.git] / MdeModulePkg / Universal / iScsi / IScsiConfig.h

diff --git a/MdeModulePkg/Universal/iScsi/IScsiConfig.h b/MdeModulePkg/Universal/iScsi/IScsiConfig.h
index 726b7a2f713d4d28fd8ff63fb5359635fa1ff772..aab488f4a0b9c1c3a0c58e66ee74e2dfc269d49d 100644 (file)
--- a/MdeModulePkg/Universal/iScsi/IScsiConfig.h
+++ b/MdeModulePkg/Universal/iScsi/IScsiConfig.h
@@ -21,12 +21,17 @@ Abstract:
 #ifndef _ISCSI_CONFIG_H_\r
 #define _ISCSI_CONFIG_H_\r
 \r
-#include <Library/FrameworkHiiLib.h>\r
-#include <Protocol/FrameworkFormBrowser.h>\r
-#include <Protocol/FrameworkFormCallback.h>\r
-#include <Library/FrameworkIfrSupportLib.h>\r
+//#include "Tiano.h"\r
+//#include "EfiDriverLib.h"\r
+//#include "Base.h"\r
+#include <Library/HiiLib.h>\r
+#include <Library/IfrSupportLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/BaseLib.h>\r
+//#include "EfiPrintLib.h"\r
+//#include EFI_PROTOCOL_DEFINITION (Hii)\r
+//#include EFI_PROTOCOL_DEFINITION (FormBrowser)\r
+//#include EFI_PROTOCOL_DEFINITION (FormCallback)\r
 \r
 #include <Library/NetLib.h>\r
 #include "IScsiConfigNVDataStruc.h"\r
@@ -44,7 +49,7 @@ extern UINT8  iSCSIStrings[];
   CR ( \\r
   Callback, \\r
   ISCSI_FORM_CALLBACK_INFO, \\r
-  FormCallback, \\r
+  ConfigAccess, \\r
   ISCSI_FORM_CALLBACK_INFO_SIGNATURE \\r
   )\r
 \r
@@ -74,14 +79,15 @@ typedef struct _ISCSI_CONFIG_FORM_ENTRY {
 } ISCSI_CONFIG_FORM_ENTRY;\r
 \r
 typedef struct _ISCSI_FORM_CALLBACK_INFO {\r
-  UINTN                       Signature;\r
-  EFI_HANDLE                  CallbackHandle;\r
-  EFI_FORM_CALLBACK_PROTOCOL  FormCallback;\r
-  UINT16                      *KeyList;\r
-  VOID                        *FormBuffer;\r
-  EFI_HII_HANDLE              RegisteredHandle;\r
-  EFI_HII_PROTOCOL            *Hii;\r
-  ISCSI_CONFIG_FORM_ENTRY     *Current;\r
+  UINTN                            Signature;\r
+  EFI_HANDLE                       DriverHandle;\r
+  EFI_HII_CONFIG_ACCESS_PROTOCOL   ConfigAccess;\r
+  EFI_HII_DATABASE_PROTOCOL        *HiiDatabase;\r
+  EFI_HII_CONFIG_ROUTING_PROTOCOL  *ConfigRouting;\r
+  UINT16                           *KeyList;\r
+  VOID                             *FormBuffer;\r
+  EFI_HII_HANDLE                   RegisteredHandle;\r
+  ISCSI_CONFIG_FORM_ENTRY          *Current;\r
 } ISCSI_FORM_CALLBACK_INFO;\r
 \r
 EFI_STATUS\r