Retire Extended HII library class.

[mirror_edk2.git] / MdeModulePkg / Universal / SetupBrowserDxe / Setup.h

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index 2a4eb9e80ebe67f892c20cadf7324363a571431f..ebd9a47d737c55c92c151eb1f4f97b01d6fb6eab 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -19,7 +19,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include <PiDxe.h>\r
 \r
-#include <Protocol/Print.h>\r
 #include <Protocol/SimpleTextOut.h>\r
 #include <Protocol/SimpleTextIn.h>\r
 #include <Protocol/FormBrowser2.h>\r
@@ -30,9 +29,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/HiiDatabase.h>\r
 #include <Protocol/HiiString.h>\r
 \r
-#include <MdeModuleHii.h>\r
+#include <Guid/MdeModuleHii.h>\r
 \r
-#include <Library/GraphicsLib.h>\r
 #include <Library/PrintLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
@@ -44,7 +42,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/IfrSupportLib.h>\r
 #include <Library/ExtendedIfrSupportLib.h>\r
 #include <Library/HiiLib.h>\r
-#include <Library/ExtendedHiiLib.h>\r
+#include <Library/PcdLib.h>\r
 \r
 #include "Colors.h"\r
 \r
@@ -161,7 +159,7 @@ typedef struct {
          (((EFI_SPECIFICATION_VERSION) & 0xf) << 4) | \\r
          ((EFI_SPECIFICATION_ERRATA_VERSION) & 0xf))\r
 \r
-#define SETUP_DRIVER_SIGNATURE EFI_SIGNATURE_32 ('F', 'B', 'D', 'V')\r
+#define SETUP_DRIVER_SIGNATURE SIGNATURE_32 ('F', 'B', 'D', 'V')\r
 typedef struct {\r
   UINT32                             Signature;\r
 \r
@@ -171,7 +169,6 @@ typedef struct {
   // Produced protocol\r
   //\r
   EFI_FORM_BROWSER2_PROTOCOL         FormBrowser2;\r
-  EFI_PRINT_PROTOCOL                 Print;\r
 \r
 } SETUP_DRIVER_PRIVATE_DATA;\r
 \r
@@ -202,7 +199,7 @@ typedef struct {
   EFI_IFR_TYPE_VALUE  Value;\r
 } EFI_HII_VALUE;\r
 \r
-#define NAME_VALUE_NODE_SIGNATURE  EFI_SIGNATURE_32 ('N', 'V', 'S', 'T')\r
+#define NAME_VALUE_NODE_SIGNATURE  SIGNATURE_32 ('N', 'V', 'S', 'T')\r
 \r
 typedef struct {\r
   UINTN            Signature;\r
@@ -214,7 +211,7 @@ typedef struct {
 \r
 #define NAME_VALUE_NODE_FROM_LINK(a)  CR (a, NAME_VALUE_NODE, Link, NAME_VALUE_NODE_SIGNATURE)\r
 \r
-#define FORMSET_STORAGE_SIGNATURE  EFI_SIGNATURE_32 ('F', 'S', 'T', 'G')\r
+#define FORMSET_STORAGE_SIGNATURE  SIGNATURE_32 ('F', 'S', 'T', 'G')\r
 \r
 typedef struct {\r
   UINTN            Signature;\r
@@ -242,7 +239,7 @@ typedef struct {
 \r
 #define FORMSET_STORAGE_FROM_LINK(a)  CR (a, FORMSET_STORAGE, Link, FORMSET_STORAGE_SIGNATURE)\r
 \r
-#define EXPRESSION_OPCODE_SIGNATURE  EFI_SIGNATURE_32 ('E', 'X', 'O', 'P')\r
+#define EXPRESSION_OPCODE_SIGNATURE  SIGNATURE_32 ('E', 'X', 'O', 'P')\r
 \r
 typedef struct {\r
   UINTN             Signature;\r
@@ -268,7 +265,7 @@ typedef struct {
 \r
 #define EXPRESSION_OPCODE_FROM_LINK(a)  CR (a, EXPRESSION_OPCODE, Link, EXPRESSION_OPCODE_SIGNATURE)\r
 \r
-#define FORM_EXPRESSION_SIGNATURE  EFI_SIGNATURE_32 ('F', 'E', 'X', 'P')\r
+#define FORM_EXPRESSION_SIGNATURE  SIGNATURE_32 ('F', 'E', 'X', 'P')\r
 \r
 typedef struct {\r
   UINTN             Signature;\r
@@ -286,7 +283,7 @@ typedef struct {
 \r
 #define FORM_EXPRESSION_FROM_LINK(a)  CR (a, FORM_EXPRESSION, Link, FORM_EXPRESSION_SIGNATURE)\r
 \r
-#define QUESTION_DEFAULT_SIGNATURE  EFI_SIGNATURE_32 ('Q', 'D', 'F', 'T')\r
+#define QUESTION_DEFAULT_SIGNATURE  SIGNATURE_32 ('Q', 'D', 'F', 'T')\r
 \r
 typedef struct {\r
   UINTN               Signature;\r
@@ -300,7 +297,7 @@ typedef struct {
 \r
 #define QUESTION_DEFAULT_FROM_LINK(a)  CR (a, QUESTION_DEFAULT, Link, QUESTION_DEFAULT_SIGNATURE)\r
 \r
-#define QUESTION_OPTION_SIGNATURE  EFI_SIGNATURE_32 ('Q', 'O', 'P', 'T')\r
+#define QUESTION_OPTION_SIGNATURE  SIGNATURE_32 ('Q', 'O', 'P', 'T')\r
 \r
 typedef struct {\r
   UINTN               Signature;\r
@@ -316,7 +313,7 @@ typedef struct {
 \r
 #define QUESTION_OPTION_FROM_LINK(a)  CR (a, QUESTION_OPTION, Link, QUESTION_OPTION_SIGNATURE)\r
 \r
-#define FORM_BROWSER_STATEMENT_SIGNATURE  EFI_SIGNATURE_32 ('F', 'S', 'T', 'A')\r
+#define FORM_BROWSER_STATEMENT_SIGNATURE  SIGNATURE_32 ('F', 'S', 'T', 'A')\r
 typedef struct {\r
   UINTN                 Signature;\r
   LIST_ENTRY            Link;\r
@@ -388,7 +385,7 @@ typedef struct {
 \r
 #define FORM_BROWSER_STATEMENT_FROM_LINK(a)  CR (a, FORM_BROWSER_STATEMENT, Link, FORM_BROWSER_STATEMENT_SIGNATURE)\r
 \r
-#define FORM_BROWSER_FORM_SIGNATURE  EFI_SIGNATURE_32 ('F', 'F', 'R', 'M')\r
+#define FORM_BROWSER_FORM_SIGNATURE  SIGNATURE_32 ('F', 'F', 'R', 'M')\r
 \r
 typedef struct {\r
   UINTN             Signature;\r
@@ -405,7 +402,7 @@ typedef struct {
 \r
 #define FORM_BROWSER_FORM_FROM_LINK(a)  CR (a, FORM_BROWSER_FORM, Link, FORM_BROWSER_FORM_SIGNATURE)\r
 \r
-#define FORMSET_DEFAULTSTORE_SIGNATURE  EFI_SIGNATURE_32 ('F', 'D', 'F', 'S')\r
+#define FORMSET_DEFAULTSTORE_SIGNATURE  SIGNATURE_32 ('F', 'D', 'F', 'S')\r
 \r
 typedef struct {\r
   UINTN            Signature;\r
@@ -453,7 +450,6 @@ extern UINTN                 gFunctionKeySetting;
 extern BOOLEAN               gResetRequired;\r
 extern BOOLEAN               gNvUpdateRequired;\r
 extern EFI_HII_HANDLE        gHiiHandle;\r
-extern BOOLEAN               gFirstIn;\r
 extern UINT16                gDirection;\r
 extern EFI_SCREEN_DESCRIPTOR gScreenDimensions;\r
 extern BOOLEAN               gUpArrow;\r
@@ -468,6 +464,7 @@ extern CHAR16            *gFunctionNineString;
 extern CHAR16            *gFunctionTenString;\r
 extern CHAR16            *gEnterString;\r
 extern CHAR16            *gEnterCommitString;\r
+extern CHAR16            *gEnterEscapeString;\r
 extern CHAR16            *gEscapeString;\r
 extern CHAR16            *gSaveFailed;\r
 extern CHAR16            *gMoveHighlight;\r
@@ -490,6 +487,8 @@ extern CHAR16            *gMiniString;
 extern CHAR16            *gPlusString;\r
 extern CHAR16            *gMinusString;\r
 extern CHAR16            *gAdjustNumber;\r
+extern CHAR16            *gSaveChanges;\r
+extern CHAR16            *gOptionMismatch;\r
 \r
 extern CHAR16            gPromptBlockWidth;\r
 extern CHAR16            gOptionBlockWidth;\r
@@ -509,8 +508,7 @@ extern EFI_GUID          gTianoHiiIfrGuid;
 VOID\r
 InitializeBrowserStrings (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Prints a unicode string to the default console,\r
@@ -524,8 +522,7 @@ InitializeBrowserStrings (
 UINTN\r
 PrintString (\r
   IN CHAR16       *String\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Prints a chracter to the default console,\r
@@ -539,8 +536,7 @@ PrintString (
 UINTN\r
 PrintChar (\r
   CHAR16       Character\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Prints a formatted unicode string to the default console, at\r
@@ -560,8 +556,7 @@ PrintAt (
   IN UINTN     Row,\r
   IN CHAR16    *Fmt,\r
   ...\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Prints a unicode string to the default console, at\r
@@ -579,8 +574,7 @@ PrintStringAt (
   IN UINTN     Column,\r
   IN UINTN     Row,\r
   IN CHAR16    *String\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Prints a chracter to the default console, at\r
@@ -598,8 +592,7 @@ PrintCharAt (
   IN UINTN     Column,\r
   IN UINTN     Row,\r
   CHAR16       Character\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Parse opcodes in the formset IFR binary.\r
@@ -613,8 +606,7 @@ PrintCharAt (
 EFI_STATUS\r
 ParseOpCodes (\r
   IN FORM_BROWSER_FORMSET              *FormSet\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Free resources allocated for a FormSet.\r
@@ -625,8 +617,7 @@ ParseOpCodes (
 VOID\r
 DestroyFormSet (\r
   IN OUT FORM_BROWSER_FORMSET  *FormSet\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   This function displays the page frame.\r
@@ -635,8 +626,7 @@ DestroyFormSet (
 VOID\r
 DisplayPageFrame (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Create a new string in HII Package List.\r
@@ -652,8 +642,7 @@ EFI_STRING_ID
 NewString (\r
   IN  CHAR16                   *String,\r
   IN  EFI_HII_HANDLE           HiiHandle\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Delete a string from HII Package List.\r
@@ -668,8 +657,7 @@ EFI_STATUS
 DeleteString (\r
   IN  EFI_STRING_ID            StringId,\r
   IN  EFI_HII_HANDLE           HiiHandle\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Get the string based on the StringId and HII Package List Handle.\r
@@ -685,8 +673,7 @@ CHAR16 *
 GetToken (\r
   IN  EFI_STRING_ID                Token,\r
   IN  EFI_HII_HANDLE               HiiHandle\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Draw a pop up windows based on the dimension, number of lines and\r
@@ -694,16 +681,15 @@ GetToken (
 \r
   @param RequestedWidth  The width of the pop-up.\r
   @param NumberOfLines   The number of lines.\r
-  @param ArrayOfStrings  The array of string to be printed.\r
+  @param Marker          The variable argument list for the list of string to be printed.\r
 \r
 **/\r
 VOID\r
 CreateSharedPopUp (\r
   IN  UINTN                       RequestedWidth,\r
   IN  UINTN                       NumberOfLines,\r
-  IN  CHAR16                      **ArrayOfStrings\r
-  )\r
-;\r
+  IN  VA_LIST                     Marker\r
+  );\r
 \r
 /**\r
   Routine used to abstract a generic dialog interface and return the selected key or string\r
@@ -721,7 +707,6 @@ CreateSharedPopUp (
   @param  StringBuffer           The passed in pointer to the buffer which will\r
                                  hold the typed in string if HotKey is FALSE\r
   @param  KeyValue               The EFI_KEY value returned if HotKey is TRUE..\r
-  @param  String                 Pointer to the first string in the list\r
   @param  ...                    A series of (quantity == NumberOfLines) text\r
                                  strings which will be used to construct the dialog\r
                                  box\r
@@ -739,10 +724,8 @@ CreateDialog (
   IN  UINTN                       MaximumStringSize,\r
   OUT CHAR16                      *StringBuffer,\r
   OUT EFI_INPUT_KEY               *KeyValue,\r
-  IN  CHAR16                      *String,\r
   ...\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Get Question's current Value.\r
@@ -762,8 +745,7 @@ GetQuestionValue (
   IN FORM_BROWSER_FORM                *Form,\r
   IN OUT FORM_BROWSER_STATEMENT       *Question,\r
   IN BOOLEAN                          Cached\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Save Question Value to edit copy(cached) or Storage(uncached).\r
@@ -783,8 +765,7 @@ SetQuestionValue (
   IN FORM_BROWSER_FORM                *Form,\r
   IN OUT FORM_BROWSER_STATEMENT       *Question,\r
   IN BOOLEAN                          Cached\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Perform inconsistent check for a Form.\r
@@ -804,8 +785,7 @@ ValidateQuestion (
   IN  FORM_BROWSER_FORM               *Form,\r
   IN  FORM_BROWSER_STATEMENT          *Question,\r
   IN  UINTN                           Type\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Submit a Form.\r
@@ -820,8 +800,7 @@ EFI_STATUS
 SubmitForm (\r
   IN FORM_BROWSER_FORMSET             *FormSet,\r
   IN FORM_BROWSER_FORM                *Form\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Reset Question to its default value.\r
@@ -840,8 +819,7 @@ GetQuestionDefault (
   IN FORM_BROWSER_FORM                *Form,\r
   IN FORM_BROWSER_STATEMENT           *Question,\r
   IN UINT16                           DefaultId\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Get current setting of Questions.\r
@@ -854,8 +832,7 @@ GetQuestionDefault (
 EFI_STATUS\r
 InitializeCurrentSetting (\r
   IN OUT FORM_BROWSER_FORMSET             *FormSet\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Initialize the internal data structure of a FormSet.\r
@@ -875,8 +852,7 @@ InitializeFormSet (
   IN  EFI_HII_HANDLE                   Handle,\r
   IN OUT EFI_GUID                      *FormSetGuid,\r
   OUT FORM_BROWSER_FORMSET             *FormSet\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Reset Questions in a Form to their default value.\r
@@ -893,8 +869,7 @@ ExtractFormDefault (
   IN FORM_BROWSER_FORMSET             *FormSet,\r
   IN  FORM_BROWSER_FORM               *Form,\r
   IN UINT16                           DefaultId\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Initialize Question's Edit copy from Storage.\r
@@ -909,8 +884,7 @@ EFI_STATUS
 LoadFormConfig (\r
   IN FORM_BROWSER_FORMSET             *FormSet,\r
   IN FORM_BROWSER_FORM                *Form\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Convert setting of Buffer Storage or NameValue Storage to <ConfigResp>.\r
@@ -926,8 +900,7 @@ EFI_STATUS
 StorageToConfigResp (\r
   IN FORMSET_STORAGE         *Storage,\r
   IN CHAR16                  **ConfigResp\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Convert <ConfigResp> to settings in Buffer Storage or NameValue Storage.\r
@@ -943,8 +916,7 @@ EFI_STATUS
 ConfigRespToStorage (\r
   IN FORMSET_STORAGE         *Storage,\r
   IN CHAR16                  *ConfigResp\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Fill storage's edit copy with settings requested from Configuration Driver.\r
@@ -959,8 +931,7 @@ EFI_STATUS
 LoadStorage (\r
   IN FORM_BROWSER_FORMSET    *FormSet,\r
   IN FORMSET_STORAGE         *Storage\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Fetch the Ifr binary data of a FormSet.\r
@@ -985,8 +956,7 @@ GetIfrBinaryData (
   IN OUT EFI_GUID      *FormSetGuid,\r
   OUT UINTN            *BinaryLength,\r
   OUT UINT8            **BinaryData\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   This is the routine which an external caller uses to direct the browser\r
@@ -1026,8 +996,7 @@ SendForm (
   IN  UINT16                           FormId, OPTIONAL\r
   IN  CONST EFI_SCREEN_DESCRIPTOR      *ScreenDimensions, OPTIONAL\r
   OUT EFI_BROWSER_ACTION_REQUEST       *ActionRequest  OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   This function is called by a callback handler to retrieve uncommitted state\r
@@ -1065,7 +1034,6 @@ BrowserCallback (
   IN BOOLEAN                           RetrieveData,\r
   IN CONST EFI_GUID                    *VariableGuid, OPTIONAL\r
   IN CONST CHAR16                      *VariableName  OPTIONAL\r
-  )\r
-;\r
+  );\r
 \r
 #endif\r