sync comments, fix function header, rename variable name to follow coding style.

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

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index 60cd50f7fc6f6afee73d5666baa1dc1678820397..0804d5173f9b1c525a08971c5286e93ae0efb859 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -17,9 +17,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _SETUP_H_\r
 \r
 \r
-#include <Uefi.h>\r
+#include <PiDxe.h>\r
 \r
 #include <Protocol/Print.h>\r
+#include <Protocol/Print2.h>\r
 #include <Protocol/SimpleTextOut.h>\r
 #include <Protocol/SimpleTextIn.h>\r
 #include <Protocol/FormBrowser2.h>\r
@@ -172,7 +173,7 @@ typedef struct {
   // Produced protocol\r
   //\r
   EFI_FORM_BROWSER2_PROTOCOL         FormBrowser2;\r
-  EFI_PRINT_PROTOCOL                 Print;\r
+  EFI_PRINT2_PROTOCOL                Print;\r
 \r
 } SETUP_DRIVER_PRIVATE_DATA;\r
 \r
@@ -454,7 +455,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
@@ -469,6 +469,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
@@ -491,6 +492,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
@@ -510,8 +513,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
@@ -525,8 +527,7 @@ InitializeBrowserStrings (
 UINTN\r
 PrintString (\r
   IN CHAR16       *String\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Prints a chracter to the default console,\r
@@ -540,8 +541,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
@@ -561,8 +561,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
@@ -580,8 +579,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
@@ -599,8 +597,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
@@ -614,8 +611,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
@@ -626,8 +622,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
@@ -636,8 +631,7 @@ DestroyFormSet (
 VOID\r
 DisplayPageFrame (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Create a new string in HII Package List.\r
@@ -653,8 +647,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
@@ -669,8 +662,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
@@ -686,8 +678,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
@@ -703,8 +694,7 @@ CreateSharedPopUp (
   IN  UINTN                       RequestedWidth,\r
   IN  UINTN                       NumberOfLines,\r
   IN  VA_LIST                     Marker\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Routine used to abstract a generic dialog interface and return the selected key or string\r
@@ -741,8 +731,7 @@ CreateDialog (
   OUT CHAR16                      *StringBuffer,\r
   OUT EFI_INPUT_KEY               *KeyValue,\r
   ...\r
-  )\r
-;\r
+  );\r
 \r
 /**\r
   Get Question's current Value.\r
@@ -762,8 +751,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 +771,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 +791,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 +806,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 +825,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 +838,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 +858,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 +875,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 +890,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 +906,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 +922,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 +937,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 +962,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 +1002,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 +1040,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