UEFI HII: Merge UEFI HII support changes from branch.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4600 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 13 insertions, 17 deletions

diff --git a/MdePkg/Include/Protocol/FormBrowser2.h b/MdePkg/Include/Protocol/FormBrowser2.h
index 36e47e150c..34fd9b71a7 100644
--- a/MdePkg/Include/Protocol/FormBrowser2.h
+++ b/MdePkg/Include/Protocol/FormBrowser2.h
@@ -17,11 +17,8 @@
 #ifndef __EFI_FORM_BROWSER_H__

 #define __EFI_FORM_BROWSER_H__

 

-#error "UEFI 2.1 HII is not fully implemented for now, Please don't include this file now."

-

-

 #define EFI_FORM_BROWSER2_PROTOCOL_GUID \

-  { 0xe5a1333e, 0xe1b4, 0x4e55, { 0xce, 0xeb, 0x35, 0xc3, 0xef, 0x13, 0x34, 0x43 } }

+  {0xb9d4c360, 0xbcfb, 0x4f9b, {0x92, 0x98, 0x53, 0xc1, 0x36, 0x98, 0x22, 0x58 }}

 

 

 typedef struct _EFI_FORM_BROWSER2_PROTOCOL   EFI_FORM_BROWSER2_PROTOCOL;

@@ -54,10 +51,10 @@ typedef struct {
 

 typedef UINTN EFI_BROWSER_ACTION_REQUEST;

 

-#define EFI_BROWSER_ACTION_NONE   0

-#define EFI_BROWSER_ACTION_RESET  1

-#define EFI_BROWSER_ACTION_SUMBIT 2

-#define EFI_BROWSER_ACTION_EXIT   3

+#define EFI_BROWSER_ACTION_REQUEST_NONE   0

+#define EFI_BROWSER_ACTION_REQUEST_RESET  1

+#define EFI_BROWSER_ACTION_REQUEST_SUBMIT 2

+#define EFI_BROWSER_ACTION_REQUEST_EXIT   3

 

 

 /**

@@ -67,7 +64,7 @@ typedef UINTN EFI_BROWSER_ACTION_REQUEST;
   the browser to use a variety of passed-in information or

   primarily use the HII database as the source of information.

 

-  @param This   A pointer to the EFI_FORM_BROWSER_PROTOCOL

+  @param This   A pointer to the EFI_FORM_BROWSER2_PROTOCOL

                 instance.

 

   @param Handle   A pointer to an array of HII handles to

@@ -121,12 +118,12 @@ typedef UINTN EFI_BROWSER_ACTION_REQUEST;
 typedef

 EFI_STATUS

 (EFIAPI *EFI_SEND_FORM2) (

-  IN CONST  EFI_FORM_BROWSER_PROTOCOL  *This,

-  IN CONST  EFI_HII_HANDLE             *Handle,

-  IN CONST  UINTN                      HandleCount,

-  IN CONST  BOOLEAN                    SingleUse,

+  IN CONST  EFI_FORM_BROWSER2_PROTOCOL  *This,

+  IN        EFI_HII_HANDLE              *Handle,

+  IN        UINTN                      HandleCount,

+  IN        EFI_GUID                   *FormSetGuid, OPTIONAL

+  IN        EFI_FORM_ID                FormId, OPTIONAL

   IN CONST  EFI_SCREEN_DESCRIPTOR      *ScreenDimensions, OPTIONAL

-  OUT       BOOLEAN                    *ResetRequired OPTIONAL

   OUT       EFI_BROWSER_ACTION_REQUEST *ActionRequest  OPTIONAL

 );

 

@@ -137,7 +134,7 @@ EFI_STATUS
   browser. This routine called this service in the browser to

   retrieve or set certain uncommitted state information.

 

-  @param This   A pointer to the EFI_FORM_BROWSER_PROTOCOL

+  @param This   A pointer to the EFI_FORM_BROWSER2_PROTOCOL

                 instance.

 

   @param ResultsDataSize  A pointer to the size of the buffer

@@ -172,7 +169,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (EFIAPI *EFI_BROWSER_CALLBACK2 ) (

-  IN CONST  EFI_FORM_BROWSER_PROTOCOL *This,

+  IN CONST  EFI_FORM_BROWSER2_PROTOCOL *This,

   IN OUT    UINTN                     *ResultsDataSize,

   IN OUT    EFI_STRING                ResultsData,

   IN CONST  BOOLEAN                   RetrieveData,

@@ -213,4 +210,3 @@ extern EFI_GUID gEfiFormBrowser2ProtocolGuid;
 

 #endif

 

-