X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FSetupBrowserDxe%2FSetup.h;h=b352482f461428508edab67ea689a654d174fe20;hp=e41f953ac9c1d0af3f4583b1936e0b0a46355fe0;hb=cb7d01c0c9fd199742d0fed6aa69dab0c79c3338;hpb=ebe43565f9f7ace6d19410c397c0df7482b022f3 diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h index e41f953ac9..b352482f46 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 +#include -#include -#include #include #include #include @@ -31,9 +29,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include -#include +#include -#include #include #include #include @@ -42,11 +39,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include -#include -#include #include -#include #include +#include #include "Colors.h" @@ -163,7 +158,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 +168,6 @@ typedef struct { // Produced protocol // EFI_FORM_BROWSER2_PROTOCOL FormBrowser2; - EFI_PRINT2_PROTOCOL Print; } SETUP_DRIVER_PRIVATE_DATA; @@ -204,7 +198,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 +210,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 +238,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 +264,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 +282,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 +296,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 +312,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 +384,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 +401,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 +463,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 +487,7 @@ extern CHAR16 *gPlusString; extern CHAR16 *gMinusString; extern CHAR16 *gAdjustNumber; extern CHAR16 *gSaveChanges; +extern CHAR16 *gOptionMismatch; extern CHAR16 gPromptBlockWidth; extern CHAR16 gOptionBlockWidth; @@ -511,8 +507,7 @@ extern EFI_GUID gTianoHiiIfrGuid; VOID InitializeBrowserStrings ( VOID - ) -; + ); /** Prints a unicode string to the default console, @@ -526,8 +521,7 @@ InitializeBrowserStrings ( UINTN PrintString ( IN CHAR16 *String - ) -; + ); /** Prints a chracter to the default console, @@ -541,8 +535,7 @@ PrintString ( UINTN PrintChar ( CHAR16 Character - ) -; + ); /** Prints a formatted unicode string to the default console, at @@ -562,8 +555,7 @@ PrintAt ( IN UINTN Row, IN CHAR16 *Fmt, ... - ) -; + ); /** Prints a unicode string to the default console, at @@ -581,8 +573,7 @@ PrintStringAt ( IN UINTN Column, IN UINTN Row, IN CHAR16 *String - ) -; + ); /** Prints a chracter to the default console, at @@ -600,8 +591,7 @@ PrintCharAt ( IN UINTN Column, IN UINTN Row, CHAR16 Character - ) -; + ); /** Parse opcodes in the formset IFR binary. @@ -615,8 +605,7 @@ PrintCharAt ( EFI_STATUS ParseOpCodes ( IN FORM_BROWSER_FORMSET *FormSet - ) -; + ); /** Free resources allocated for a FormSet. @@ -627,8 +616,7 @@ ParseOpCodes ( VOID DestroyFormSet ( IN OUT FORM_BROWSER_FORMSET *FormSet - ) -; + ); /** This function displays the page frame. @@ -637,8 +625,7 @@ DestroyFormSet ( VOID DisplayPageFrame ( VOID - ) -; + ); /** Create a new string in HII Package List. @@ -654,8 +641,7 @@ EFI_STRING_ID NewString ( IN CHAR16 *String, IN EFI_HII_HANDLE HiiHandle - ) -; + ); /** Delete a string from HII Package List. @@ -670,8 +656,7 @@ EFI_STATUS DeleteString ( IN EFI_STRING_ID StringId, IN EFI_HII_HANDLE HiiHandle - ) -; + ); /** Get the string based on the StringId and HII Package List Handle. @@ -687,8 +672,7 @@ CHAR16 * GetToken ( IN EFI_STRING_ID Token, IN EFI_HII_HANDLE HiiHandle - ) -; + ); /** Draw a pop up windows based on the dimension, number of lines and @@ -704,8 +688,7 @@ CreateSharedPopUp ( IN UINTN RequestedWidth, IN UINTN NumberOfLines, IN VA_LIST Marker - ) -; + ); /** Routine used to abstract a generic dialog interface and return the selected key or string @@ -723,7 +706,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 @@ -742,8 +724,7 @@ CreateDialog ( OUT CHAR16 *StringBuffer, OUT EFI_INPUT_KEY *KeyValue, ... - ) -; + ); /** Get Question's current Value. @@ -763,8 +744,7 @@ GetQuestionValue ( IN FORM_BROWSER_FORM *Form, IN OUT FORM_BROWSER_STATEMENT *Question, IN BOOLEAN Cached - ) -; + ); /** Save Question Value to edit copy(cached) or Storage(uncached). @@ -784,8 +764,7 @@ SetQuestionValue ( IN FORM_BROWSER_FORM *Form, IN OUT FORM_BROWSER_STATEMENT *Question, IN BOOLEAN Cached - ) -; + ); /** Perform inconsistent check for a Form. @@ -805,8 +784,7 @@ ValidateQuestion ( IN FORM_BROWSER_FORM *Form, IN FORM_BROWSER_STATEMENT *Question, IN UINTN Type - ) -; + ); /** Submit a Form. @@ -821,8 +799,7 @@ EFI_STATUS SubmitForm ( IN FORM_BROWSER_FORMSET *FormSet, IN FORM_BROWSER_FORM *Form - ) -; + ); /** Reset Question to its default value. @@ -841,8 +818,7 @@ GetQuestionDefault ( IN FORM_BROWSER_FORM *Form, IN FORM_BROWSER_STATEMENT *Question, IN UINT16 DefaultId - ) -; + ); /** Get current setting of Questions. @@ -855,8 +831,7 @@ GetQuestionDefault ( EFI_STATUS InitializeCurrentSetting ( IN OUT FORM_BROWSER_FORMSET *FormSet - ) -; + ); /** Initialize the internal data structure of a FormSet. @@ -876,8 +851,7 @@ InitializeFormSet ( IN EFI_HII_HANDLE Handle, IN OUT EFI_GUID *FormSetGuid, OUT FORM_BROWSER_FORMSET *FormSet - ) -; + ); /** Reset Questions in a Form to their default value. @@ -894,8 +868,7 @@ ExtractFormDefault ( IN FORM_BROWSER_FORMSET *FormSet, IN FORM_BROWSER_FORM *Form, IN UINT16 DefaultId - ) -; + ); /** Initialize Question's Edit copy from Storage. @@ -910,8 +883,7 @@ EFI_STATUS LoadFormConfig ( IN FORM_BROWSER_FORMSET *FormSet, IN FORM_BROWSER_FORM *Form - ) -; + ); /** Convert setting of Buffer Storage or NameValue Storage to . @@ -927,8 +899,7 @@ EFI_STATUS StorageToConfigResp ( IN FORMSET_STORAGE *Storage, IN CHAR16 **ConfigResp - ) -; + ); /** Convert to settings in Buffer Storage or NameValue Storage. @@ -944,8 +915,7 @@ EFI_STATUS ConfigRespToStorage ( IN FORMSET_STORAGE *Storage, IN CHAR16 *ConfigResp - ) -; + ); /** Fill storage's edit copy with settings requested from Configuration Driver. @@ -960,8 +930,7 @@ EFI_STATUS LoadStorage ( IN FORM_BROWSER_FORMSET *FormSet, IN FORMSET_STORAGE *Storage - ) -; + ); /** Fetch the Ifr binary data of a FormSet. @@ -986,8 +955,7 @@ GetIfrBinaryData ( IN OUT EFI_GUID *FormSetGuid, OUT UINTN *BinaryLength, OUT UINT8 **BinaryData - ) -; + ); /** This is the routine which an external caller uses to direct the browser @@ -1027,8 +995,7 @@ SendForm ( IN UINT16 FormId, OPTIONAL IN CONST EFI_SCREEN_DESCRIPTOR *ScreenDimensions, OPTIONAL OUT EFI_BROWSER_ACTION_REQUEST *ActionRequest OPTIONAL - ) -; + ); /** This function is called by a callback handler to retrieve uncommitted state @@ -1066,7 +1033,6 @@ BrowserCallback ( IN BOOLEAN RetrieveData, IN CONST EFI_GUID *VariableGuid, OPTIONAL IN CONST CHAR16 *VariableName OPTIONAL - ) -; + ); #endif