UEFI HII: Merge UEFI HII support changes from branch.

[mirror_edk2.git] / MdePkg / Include / Protocol / FormBrowser2.h

diff --git a/MdePkg/Include/Protocol/FormBrowser2.h b/MdePkg/Include/Protocol/FormBrowser2.h
index 36e47e150cf67c0057f9362bf42fee28fc2e2442..34fd9b71a7b796f4d4177b68a549ccac65c09353 100644 (file)
--- a/MdePkg/Include/Protocol/FormBrowser2.h
+++ b/MdePkg/Include/Protocol/FormBrowser2.h
@@ -17,11 +17,8 @@
 #ifndef __EFI_FORM_BROWSER_H__\r
 #define __EFI_FORM_BROWSER_H__\r
 \r
-#error "UEFI 2.1 HII is not fully implemented for now, Please don't include this file now."\r
-\r
-\r
 #define EFI_FORM_BROWSER2_PROTOCOL_GUID \\r
-  { 0xe5a1333e, 0xe1b4, 0x4e55, { 0xce, 0xeb, 0x35, 0xc3, 0xef, 0x13, 0x34, 0x43 } }\r
+  {0xb9d4c360, 0xbcfb, 0x4f9b, {0x92, 0x98, 0x53, 0xc1, 0x36, 0x98, 0x22, 0x58 }}\r
 \r
 \r
 typedef struct _EFI_FORM_BROWSER2_PROTOCOL   EFI_FORM_BROWSER2_PROTOCOL;\r
@@ -54,10 +51,10 @@ typedef struct {
 \r
 typedef UINTN EFI_BROWSER_ACTION_REQUEST;\r
 \r
-#define EFI_BROWSER_ACTION_NONE   0\r
-#define EFI_BROWSER_ACTION_RESET  1\r
-#define EFI_BROWSER_ACTION_SUMBIT 2\r
-#define EFI_BROWSER_ACTION_EXIT   3\r
+#define EFI_BROWSER_ACTION_REQUEST_NONE   0\r
+#define EFI_BROWSER_ACTION_REQUEST_RESET  1\r
+#define EFI_BROWSER_ACTION_REQUEST_SUBMIT 2\r
+#define EFI_BROWSER_ACTION_REQUEST_EXIT   3\r
 \r
 \r
 /**\r
@@ -67,7 +64,7 @@ typedef UINTN EFI_BROWSER_ACTION_REQUEST;
   the browser to use a variety of passed-in information or\r
   primarily use the HII database as the source of information.\r
 \r
-  @param This   A pointer to the EFI_FORM_BROWSER_PROTOCOL\r
+  @param This   A pointer to the EFI_FORM_BROWSER2_PROTOCOL\r
                 instance.\r
 \r
   @param Handle   A pointer to an array of HII handles to\r
@@ -121,12 +118,12 @@ typedef UINTN EFI_BROWSER_ACTION_REQUEST;
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_SEND_FORM2) (\r
-  IN CONST  EFI_FORM_BROWSER_PROTOCOL  *This,\r
-  IN CONST  EFI_HII_HANDLE             *Handle,\r
-  IN CONST  UINTN                      HandleCount,\r
-  IN CONST  BOOLEAN                    SingleUse,\r
+  IN CONST  EFI_FORM_BROWSER2_PROTOCOL  *This,\r
+  IN        EFI_HII_HANDLE              *Handle,\r
+  IN        UINTN                      HandleCount,\r
+  IN        EFI_GUID                   *FormSetGuid, OPTIONAL\r
+  IN        EFI_FORM_ID                FormId, OPTIONAL\r
   IN CONST  EFI_SCREEN_DESCRIPTOR      *ScreenDimensions, OPTIONAL\r
-  OUT       BOOLEAN                    *ResetRequired OPTIONAL\r
   OUT       EFI_BROWSER_ACTION_REQUEST *ActionRequest  OPTIONAL\r
 );\r
 \r
@@ -137,7 +134,7 @@ EFI_STATUS
   browser. This routine called this service in the browser to\r
   retrieve or set certain uncommitted state information.\r
 \r
-  @param This   A pointer to the EFI_FORM_BROWSER_PROTOCOL\r
+  @param This   A pointer to the EFI_FORM_BROWSER2_PROTOCOL\r
                 instance.\r
 \r
   @param ResultsDataSize  A pointer to the size of the buffer\r
@@ -172,7 +169,7 @@ EFI_STATUS
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_BROWSER_CALLBACK2 ) (\r
-  IN CONST  EFI_FORM_BROWSER_PROTOCOL *This,\r
+  IN CONST  EFI_FORM_BROWSER2_PROTOCOL *This,\r
   IN OUT    UINTN                     *ResultsDataSize,\r
   IN OUT    EFI_STRING                ResultsData,\r
   IN CONST  BOOLEAN                   RetrieveData,\r
@@ -213,4 +210,3 @@ extern EFI_GUID gEfiFormBrowser2ProtocolGuid;
 \r
 #endif\r
 \r
-\r