X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FSetupBrowserDxe%2FSetup.h;h=cbdcbd5a1d8eea8ce86a893ebd09576e3239913c;hb=5c526736370b475e85c59fafe3900101a95e93d3;hp=9dcfdb6ee5855bf49ff22df0707939bfce6edcf8;hpb=ed66e1bc0d2be0a185fc47adab4930c3b7e2767f;p=mirror_edk2.git

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index 9dcfdb6ee5..cbdcbd5a1d 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -17,10 +17,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _SETUP_H_
 
 
-#include <Uefi.h>
+#include <PiDxe.h>
 
-#include <Protocol/Print.h>
-#include <Protocol/Print2.h>
 #include <Protocol/SimpleTextOut.h>
 #include <Protocol/SimpleTextIn.h>
 #include <Protocol/FormBrowser2.h>
@@ -30,10 +28,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/HiiConfigRouting.h>
 #include <Protocol/HiiDatabase.h>
 #include <Protocol/HiiString.h>
+#include <Protocol/ConsoleControl.h>
 
-#include <MdeModuleHii.h>
+#include <Guid/MdeModuleHii.h>
 
-#include <Library/GraphicsLib.h>
 #include <Library/PrintLib.h>
 #include <Library/DebugLib.h>
 #include <Library/BaseMemoryLib.h>
@@ -163,7 +161,7 @@ typedef struct {
          (((EFI_SPECIFICATION_VERSION) & 0xf) << 4) | \
          ((EFI_SPECIFICATION_ERRATA_VERSION) & 0xf))
 
-#define SETUP_DRIVER_SIGNATURE EFI_SIGNATURE_32 ('F', 'B', 'D', 'V')
+#define SETUP_DRIVER_SIGNATURE SIGNATURE_32 ('F', 'B', 'D', 'V')
 typedef struct {
   UINT32                             Signature;
 
@@ -173,7 +171,6 @@ typedef struct {
   // Produced protocol
   //
   EFI_FORM_BROWSER2_PROTOCOL         FormBrowser2;
-  EFI_PRINT2_PROTOCOL                Print;
 
 } SETUP_DRIVER_PRIVATE_DATA;
 
@@ -204,7 +201,7 @@ typedef struct {
   EFI_IFR_TYPE_VALUE  Value;
 } EFI_HII_VALUE;
 
-#define NAME_VALUE_NODE_SIGNATURE  EFI_SIGNATURE_32 ('N', 'V', 'S', 'T')
+#define NAME_VALUE_NODE_SIGNATURE  SIGNATURE_32 ('N', 'V', 'S', 'T')
 
 typedef struct {
   UINTN            Signature;
@@ -216,7 +213,7 @@ typedef struct {
 
 #define NAME_VALUE_NODE_FROM_LINK(a)  CR (a, NAME_VALUE_NODE, Link, NAME_VALUE_NODE_SIGNATURE)
 
-#define FORMSET_STORAGE_SIGNATURE  EFI_SIGNATURE_32 ('F', 'S', 'T', 'G')
+#define FORMSET_STORAGE_SIGNATURE  SIGNATURE_32 ('F', 'S', 'T', 'G')
 
 typedef struct {
   UINTN            Signature;
@@ -244,7 +241,7 @@ typedef struct {
 
 #define FORMSET_STORAGE_FROM_LINK(a)  CR (a, FORMSET_STORAGE, Link, FORMSET_STORAGE_SIGNATURE)
 
-#define EXPRESSION_OPCODE_SIGNATURE  EFI_SIGNATURE_32 ('E', 'X', 'O', 'P')
+#define EXPRESSION_OPCODE_SIGNATURE  SIGNATURE_32 ('E', 'X', 'O', 'P')
 
 typedef struct {
   UINTN             Signature;
@@ -270,7 +267,7 @@ typedef struct {
 
 #define EXPRESSION_OPCODE_FROM_LINK(a)  CR (a, EXPRESSION_OPCODE, Link, EXPRESSION_OPCODE_SIGNATURE)
 
-#define FORM_EXPRESSION_SIGNATURE  EFI_SIGNATURE_32 ('F', 'E', 'X', 'P')
+#define FORM_EXPRESSION_SIGNATURE  SIGNATURE_32 ('F', 'E', 'X', 'P')
 
 typedef struct {
   UINTN             Signature;
@@ -288,7 +285,7 @@ typedef struct {
 
 #define FORM_EXPRESSION_FROM_LINK(a)  CR (a, FORM_EXPRESSION, Link, FORM_EXPRESSION_SIGNATURE)
 
-#define QUESTION_DEFAULT_SIGNATURE  EFI_SIGNATURE_32 ('Q', 'D', 'F', 'T')
+#define QUESTION_DEFAULT_SIGNATURE  SIGNATURE_32 ('Q', 'D', 'F', 'T')
 
 typedef struct {
   UINTN               Signature;
@@ -302,7 +299,7 @@ typedef struct {
 
 #define QUESTION_DEFAULT_FROM_LINK(a)  CR (a, QUESTION_DEFAULT, Link, QUESTION_DEFAULT_SIGNATURE)
 
-#define QUESTION_OPTION_SIGNATURE  EFI_SIGNATURE_32 ('Q', 'O', 'P', 'T')
+#define QUESTION_OPTION_SIGNATURE  SIGNATURE_32 ('Q', 'O', 'P', 'T')
 
 typedef struct {
   UINTN               Signature;
@@ -318,7 +315,7 @@ typedef struct {
 
 #define QUESTION_OPTION_FROM_LINK(a)  CR (a, QUESTION_OPTION, Link, QUESTION_OPTION_SIGNATURE)
 
-#define FORM_BROWSER_STATEMENT_SIGNATURE  EFI_SIGNATURE_32 ('F', 'S', 'T', 'A')
+#define FORM_BROWSER_STATEMENT_SIGNATURE  SIGNATURE_32 ('F', 'S', 'T', 'A')
 typedef struct {
   UINTN                 Signature;
   LIST_ENTRY            Link;
@@ -390,7 +387,7 @@ typedef struct {
 
 #define FORM_BROWSER_STATEMENT_FROM_LINK(a)  CR (a, FORM_BROWSER_STATEMENT, Link, FORM_BROWSER_STATEMENT_SIGNATURE)
 
-#define FORM_BROWSER_FORM_SIGNATURE  EFI_SIGNATURE_32 ('F', 'F', 'R', 'M')
+#define FORM_BROWSER_FORM_SIGNATURE  SIGNATURE_32 ('F', 'F', 'R', 'M')
 
 typedef struct {
   UINTN             Signature;
@@ -407,7 +404,7 @@ typedef struct {
 
 #define FORM_BROWSER_FORM_FROM_LINK(a)  CR (a, FORM_BROWSER_FORM, Link, FORM_BROWSER_FORM_SIGNATURE)
 
-#define FORMSET_DEFAULTSTORE_SIGNATURE  EFI_SIGNATURE_32 ('F', 'D', 'F', 'S')
+#define FORMSET_DEFAULTSTORE_SIGNATURE  SIGNATURE_32 ('F', 'D', 'F', 'S')
 
 typedef struct {
   UINTN            Signature;
@@ -469,6 +466,7 @@ extern CHAR16            *gFunctionNineString;
 extern CHAR16            *gFunctionTenString;
 extern CHAR16            *gEnterString;
 extern CHAR16            *gEnterCommitString;
+extern CHAR16            *gEnterEscapeString;
 extern CHAR16            *gEscapeString;
 extern CHAR16            *gSaveFailed;
 extern CHAR16            *gMoveHighlight;
@@ -492,6 +490,7 @@ extern CHAR16            *gPlusString;
 extern CHAR16            *gMinusString;
 extern CHAR16            *gAdjustNumber;
 extern CHAR16            *gSaveChanges;
+extern CHAR16            *gOptionMismatch;
 
 extern CHAR16            gPromptBlockWidth;
 extern CHAR16            gOptionBlockWidth;
@@ -710,7 +709,6 @@ CreateSharedPopUp (
   @param  StringBuffer           The passed in pointer to the buffer which will
                                  hold the typed in string if HotKey is FALSE
   @param  KeyValue               The EFI_KEY value returned if HotKey is TRUE..
-  @param  String                 Pointer to the first string in the list
   @param  ...                    A series of (quantity == NumberOfLines) text
                                  strings which will be used to construct the dialog
                                  box