From 5fd5fcd321e3d778aa51f1a47732c8d886c1ff4c Mon Sep 17 00:00:00 2001 From: qwang12 Date: Mon, 21 Jan 2008 14:42:45 +0000 Subject: UEFI HII: Merge UEFI HII support changes from branch. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4601 6f19259b-4bc3-4df7-8a09-765794883524 --- Nt32Pkg/PlatformBdsDxe/Generic/BdsString.h | 2 +- Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BmLib.c | 4 +- .../PlatformBdsDxe/Generic/BootMaint/BootMaint.c | 26 ++--- .../PlatformBdsDxe/Generic/BootMaint/BootMaint.h | 10 +- .../PlatformBdsDxe/Generic/BootMaint/BootOption.c | 21 ---- .../Generic/BootMaint/FileExplorer.c | 8 +- .../PlatformBdsDxe/Generic/BootMaint/UpdatePage.c | 126 ++++++++++----------- .../PlatformBdsDxe/Generic/BootMaint/Variable.c | 2 +- .../PlatformBdsDxe/Generic/BootMngr/BootManager.c | 10 +- .../PlatformBdsDxe/Generic/BootMngr/BootManager.h | 2 +- .../Generic/DeviceMngr/DeviceManager.c | 24 ++-- .../Generic/DeviceMngr/DeviceManager.h | 2 +- Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c | 20 ++-- Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.h | 2 +- 14 files changed, 119 insertions(+), 140 deletions(-) (limited to 'Nt32Pkg/PlatformBdsDxe') diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BdsString.h b/Nt32Pkg/PlatformBdsDxe/Generic/BdsString.h index 1e8066537c..18a04650a0 100644 --- a/Nt32Pkg/PlatformBdsDxe/Generic/BdsString.h +++ b/Nt32Pkg/PlatformBdsDxe/Generic/BdsString.h @@ -32,7 +32,7 @@ Revision History 0x7777E939, 0xD57E, 0x4DCB, {0xA0, 0x8E, 0x64, 0xD7, 0x98, 0x57, 0x1E, 0x0F } \ } -EFI_HII_HANDLE gStringPackHandle; +FRAMEWORK_EFI_HII_HANDLE gStringPackHandle; EFI_HII_PROTOCOL *gHii; CHAR16 * diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BmLib.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BmLib.c index 8804b141ae..7e572e605f 100644 --- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BmLib.c +++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BmLib.c @@ -456,7 +456,7 @@ Returns: { EFI_STATUS Status; UINT16 HandleBufferLength; - EFI_HII_HANDLE *HiiHandleBuffer; + FRAMEWORK_EFI_HII_HANDLE *HiiHandleBuffer; UINTN StringBufferLength; UINTN NumberOfHiiHandles; UINTN Index; @@ -488,7 +488,7 @@ Returns: // // Get the Hii Handle that matches the StructureNode->ProducerName // - NumberOfHiiHandles = HandleBufferLength / sizeof (EFI_HII_HANDLE); + NumberOfHiiHandles = HandleBufferLength / sizeof (FRAMEWORK_EFI_HII_HANDLE); for (Index = 0; Index < NumberOfHiiHandles; Index++) { Length = 0; Status = ExtractDataFromHiiHandle ( diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.c index 51570f20b9..1d7420f40e 100644 --- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.c +++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.c @@ -45,7 +45,7 @@ FreeAllMenu ( EFI_STATUS CreateMenuStringToken ( IN BMM_CALLBACK_DATA *CallbackData, - IN EFI_HII_HANDLE HiiHandle, + IN FRAMEWORK_EFI_HII_HANDLE HiiHandle, IN BM_MENU_OPTION *MenuOption ) /*++ @@ -101,7 +101,7 @@ EFIAPI DriverCallback ( IN EFI_FORM_CALLBACK_PROTOCOL *This, IN UINT16 KeyValue, - IN EFI_IFR_DATA_ARRAY *Data, + IN FRAMEWORK_EFI_IFR_DATA_ARRAY *Data, OUT EFI_HII_CALLBACK_PACKET **Packet ) /*++ @@ -742,7 +742,7 @@ Returns: EFI_HII_PACKAGES *PackageList; BMM_CALLBACK_DATA *BmmCallbackInfo; EFI_HII_PROTOCOL *Hii; - EFI_HII_HANDLE HiiHandle; + FRAMEWORK_EFI_HII_HANDLE HiiHandle; EFI_STATUS Status; EFI_HANDLE Handle; UINT8 *Ptr; @@ -905,51 +905,51 @@ Returns: FORM_SET_FD_ORDER_ID, STRING_TOKEN (STR_FORM_SET_FD_ORDER_TITLE), STRING_TOKEN (STR_FORM_SET_FD_ORDER_TITLE), - EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS, + FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS, FORM_SET_FD_ORDER_ID, Location ); - Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; CreateGotoOpCode ( FORM_SET_HD_ORDER_ID, STRING_TOKEN (STR_FORM_SET_HD_ORDER_TITLE), STRING_TOKEN (STR_FORM_SET_HD_ORDER_TITLE), - EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS, + FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS, FORM_SET_HD_ORDER_ID, Location ); - Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; CreateGotoOpCode ( FORM_SET_CD_ORDER_ID, STRING_TOKEN (STR_FORM_SET_CD_ORDER_TITLE), STRING_TOKEN (STR_FORM_SET_CD_ORDER_TITLE), - EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS, + FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS, FORM_SET_CD_ORDER_ID, Location ); - Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; CreateGotoOpCode ( FORM_SET_NET_ORDER_ID, STRING_TOKEN (STR_FORM_SET_NET_ORDER_TITLE), STRING_TOKEN (STR_FORM_SET_NET_ORDER_TITLE), - EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS, + FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS, FORM_SET_NET_ORDER_ID, Location ); - Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; CreateGotoOpCode ( FORM_SET_BEV_ORDER_ID, STRING_TOKEN (STR_FORM_SET_BEV_ORDER_TITLE), STRING_TOKEN (STR_FORM_SET_BEV_ORDER_TITLE), - EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS, + FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS, FORM_SET_BEV_ORDER_ID, Location ); @@ -1313,5 +1313,5 @@ CreateCallbackPacket ( (*Packet)->DataArray.EntryCount = 1; (*Packet)->DataArray.NvRamMap = NULL; - ((EFI_IFR_DATA_ENTRY *) (&((*Packet)->DataArray) + 1))->Flags = Flags; + ((FRAMEWORK_EFI_IFR_DATA_ENTRY *) (&((*Packet)->DataArray) + 1))->Flags = Flags; } diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.h b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.h index c366a66577..d26d7f7f94 100644 --- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.h +++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootMaint.h @@ -523,7 +523,7 @@ typedef struct { // // BMM main formset callback data. // - EFI_HII_HANDLE BmmHiiHandle; + FRAMEWORK_EFI_HII_HANDLE BmmHiiHandle; EFI_HANDLE BmmCallbackHandle; EFI_FORM_CALLBACK_PROTOCOL BmmDriverCallback; FORM_ID BmmCurrentPageId; @@ -535,7 +535,7 @@ typedef struct { // // File explorer formset callback data. // - EFI_HII_HANDLE FeHiiHandle; + FRAMEWORK_EFI_HII_HANDLE FeHiiHandle; EFI_HANDLE FeCallbackHandle; EFI_FORM_CALLBACK_PROTOCOL FeDriverCallback; FILE_EXPLORER_STATE FeCurrentState; @@ -758,7 +758,7 @@ Var_ChangeBootOrder (); EFI_STATUS Var_UpdateDriverOption ( IN BMM_CALLBACK_DATA *CallbackData, - IN EFI_HII_HANDLE HiiHandle, + IN FRAMEWORK_EFI_HII_HANDLE HiiHandle, IN UINT16 *DescriptionData, IN UINT16 *OptionalData, IN UINT8 ForceReconnect @@ -1017,7 +1017,7 @@ EfiDevicePathInstanceCount ( EFI_STATUS CreateMenuStringToken ( IN BMM_CALLBACK_DATA *CallbackData, - IN EFI_HII_HANDLE HiiHandle, + IN FRAMEWORK_EFI_HII_HANDLE HiiHandle, IN BM_MENU_OPTION *MenuOption ); @@ -1097,7 +1097,7 @@ EFIAPI FileExplorerCallback ( IN EFI_FORM_CALLBACK_PROTOCOL *This, IN UINT16 KeyValue, - IN EFI_IFR_DATA_ARRAY *Data, + IN FRAMEWORK_EFI_IFR_DATA_ARRAY *Data, OUT EFI_HII_CALLBACK_PACKET **Packet ); diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootOption.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootOption.c index b5afc7c7fe..8685748352 100644 --- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootOption.c +++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/BootOption.c @@ -1662,24 +1662,3 @@ Returns: } -VOID -SafeFreePool ( - IN VOID *Buffer - ) -/*++ - -Routine Description: - Wrap original FreePool gBS call - in order to decrease code length - -Arguments: - -Returns: - ---*/ -{ - if (Buffer != NULL) { - FreePool (Buffer); - Buffer = NULL; - } -} diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/FileExplorer.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/FileExplorer.c index db835cf534..0e1f165513 100644 --- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/FileExplorer.c +++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/FileExplorer.c @@ -86,7 +86,7 @@ Returns: NewMenuEntry->DisplayStringToken, STR_NULL_STRING, STR_NULL_STRING, - EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS, + FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS, (UINT16) (FILE_OPTION_OFFSET + Index), Location ); @@ -104,14 +104,14 @@ Returns: FormId, NewMenuEntry->DisplayStringToken, STRING_TOKEN (STR_NULL_STRING), - EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS, + FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS, (UINT16) (FILE_OPTION_OFFSET + Index), Location ); } UpdateData->DataCount++; - Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; } CallbackData->Hii->UpdateForm ( @@ -261,7 +261,7 @@ EFIAPI FileExplorerCallback ( IN EFI_FORM_CALLBACK_PROTOCOL *This, IN UINT16 KeyValue, - IN EFI_IFR_DATA_ARRAY *Data, + IN FRAMEWORK_EFI_IFR_DATA_ARRAY *Data, OUT EFI_HII_CALLBACK_PACKET **Packet ) /*++ diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/UpdatePage.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/UpdatePage.c index 435b0753d4..56783e72ed 100644 --- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/UpdatePage.c +++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/UpdatePage.c @@ -71,14 +71,14 @@ UpdatePageStart ( FORM_MAIN_ID, STRING_TOKEN (STR_FORM_GOTO_MAIN), STRING_TOKEN (STR_FORM_GOTO_MAIN), - EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS, + FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS, FORM_MAIN_ID, *CurrentLocation ); UpdateData->DataCount++; - *CurrentLocation = *CurrentLocation + ((EFI_IFR_OP_HEADER *) (*CurrentLocation))->Length; + *CurrentLocation = *CurrentLocation + ((FRAMEWORK_EFI_IFR_OP_HEADER *) (*CurrentLocation))->Length; } } @@ -97,20 +97,20 @@ UpdatePageEnd ( FORM_MAIN_ID, STRING_TOKEN (STR_SAVE_AND_EXIT), STRING_TOKEN (STR_NULL_STRING), - EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS, + FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS, KEY_VALUE_SAVE_AND_EXIT, CurrentLocation ); UpdateData->DataCount++; - CurrentLocation = CurrentLocation + ((EFI_IFR_OP_HEADER *) CurrentLocation)->Length; + CurrentLocation = CurrentLocation + ((FRAMEWORK_EFI_IFR_OP_HEADER *) CurrentLocation)->Length; CreateGotoOpCode ( FORM_MAIN_ID, STRING_TOKEN (STR_NO_SAVE_AND_EXIT), STRING_TOKEN (STR_NULL_STRING), - EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS, + FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS, KEY_VALUE_NO_SAVE_AND_EXIT, CurrentLocation ); @@ -125,7 +125,7 @@ UpdatePageEnd ( FORM_MAIN_ID, STRING_TOKEN (STR_NO_SAVE_AND_EXIT), STRING_TOKEN (STR_NULL_STRING), - EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS, + FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS, KEY_VALUE_NO_SAVE_AND_EXIT, CurrentLocation ); @@ -217,11 +217,11 @@ UpdateConCOMPage ( FORM_CON_COM_SETUP_ID, NewMenuEntry->DisplayStringToken, STRING_TOKEN (STR_NULL_STRING), - EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS, + FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS, (UINT16) (TERMINAL_OPTION_OFFSET + Index), Location ); - Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; UpdateData->DataCount++; } } @@ -260,12 +260,12 @@ UpdateBootDelPage ( (UINT8) 1, NewMenuEntry->DisplayStringToken, NewMenuEntry->HelpStringToken, - EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS, + FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS, (UINT16) BOOT_OPTION_DEL_QUESTION_ID, Location ); - Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; UpdateData->DataCount++; } @@ -293,12 +293,12 @@ UpdateDrvAddHandlePage ( FORM_DRV_ADD_HANDLE_DESC_ID, NewMenuEntry->DisplayStringToken, STRING_TOKEN (STR_NULL_STRING), - EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS, + FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS, (UINT16) (HANDLE_OPTION_OFFSET + Index), Location ); - Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; UpdateData->DataCount++; } @@ -334,12 +334,12 @@ UpdateDrvDelPage ( (UINT8) 1, NewMenuEntry->DisplayStringToken, NewMenuEntry->HelpStringToken, - EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS, + FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS, (UINT16) DRIVER_OPTION_DEL_QUESTION_ID, Location ); - Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; UpdateData->DataCount++; } @@ -369,7 +369,7 @@ UpdateDriverAddHandleDescPage ( Location ); - Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; CreateStringOpCode ( DRV_ADD_HANDLE_DESC_QUESTION_ID, @@ -378,23 +378,23 @@ UpdateDriverAddHandleDescPage ( STRING_TOKEN (STR_NULL_STRING), 6, 75, - EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS, + FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS, KEY_VALUE_DRIVER_ADD_DESC_DATA, Location ); - Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; CreateCheckBoxOpCode ( DRV_ADD_RECON_QUESTION_ID, (UINT8) 1, STRING_TOKEN (STR_LOAD_OPTION_FORCE_RECON), STRING_TOKEN (STR_LOAD_OPTION_FORCE_RECON), - EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS, + FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS, DRV_ADD_RECON_QUESTION_ID, Location ); - Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; CreateStringOpCode ( DRIVER_ADD_OPTION_QUESTION_ID, @@ -403,12 +403,12 @@ UpdateDriverAddHandleDescPage ( STRING_TOKEN (STR_NULL_STRING), 6, 75, - EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS, + FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS, KEY_VALUE_DRIVER_ADD_OPT_DATA, Location ); - Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; UpdatePageEnd (CallbackData, Location); } @@ -437,9 +437,9 @@ UpdateConsolePage ( for (Index = 0; Index < ConsoleMenu->MenuNumber; Index++) { NewMenuEntry = BOpt_GetMenuEntry (ConsoleMenu, Index); NewConsoleContext = (BM_CONSOLE_CONTEXT *) NewMenuEntry->VariableContext; - CheckFlags = EFI_IFR_FLAG_INTERACTIVE; + CheckFlags = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE; if (NewConsoleContext->IsActive) { - CheckFlags |= EFI_IFR_FLAG_DEFAULT; + CheckFlags |= FRAMEWORK_EFI_IFR_FLAG_DEFAULT; CallbackData->BmmFakeNvData->ConsoleCheck[Index] = TRUE; } else { CallbackData->BmmFakeNvData->ConsoleCheck[Index] = FALSE; @@ -454,14 +454,14 @@ UpdateConsolePage ( (UINT16) (CONSOLE_OPTION_OFFSET + Index), Location ); - Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; UpdateData->DataCount++; } Status = EfiLibLocateProtocol (&gTerminalDriverGuid, &Interface); if (!EFI_ERROR (Status)) { for (Index2 = 0; Index2 < TerminalMenu.MenuNumber; Index2++) { - CheckFlags = EFI_IFR_FLAG_INTERACTIVE; + CheckFlags = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE; NewMenuEntry = BOpt_GetMenuEntry (&TerminalMenu, Index2); NewTerminalContext = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext; @@ -469,7 +469,7 @@ UpdateConsolePage ( (NewTerminalContext->IsConOut && (UpdatePageId == FORM_CON_OUT_ID)) || (NewTerminalContext->IsStdErr && (UpdatePageId == FORM_CON_ERR_ID)) ) { - CheckFlags |= EFI_IFR_FLAG_DEFAULT; + CheckFlags |= FRAMEWORK_EFI_IFR_FLAG_DEFAULT; CallbackData->BmmFakeNvData->ConsoleCheck[Index] = TRUE; } else { CallbackData->BmmFakeNvData->ConsoleCheck[Index] = FALSE; @@ -484,7 +484,7 @@ UpdateConsolePage ( (UINT16) (CONSOLE_OPTION_OFFSET + Index), Location ); - Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; UpdateData->DataCount++; Index++; } @@ -539,7 +539,7 @@ UpdateOrderPage ( ); for (Index = 0; Index < OptionMenu->MenuNumber + 2; Index++) { - Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; } UpdateData->DataCount = (UINT16) (UpdateData->DataCount + OptionMenu->MenuNumber + 2); @@ -588,10 +588,10 @@ UpdateBootNextPage ( NewMenuEntry = BOpt_GetMenuEntry (&BootOptionMenu, Index); NewLoadContext = (BM_LOAD_CONTEXT *) NewMenuEntry->VariableContext; if (NewLoadContext->IsBootNext) { - IfrOptionList[Index].Flags = EFI_IFR_FLAG_DEFAULT | EFI_IFR_FLAG_INTERACTIVE; + IfrOptionList[Index].Flags = FRAMEWORK_EFI_IFR_FLAG_DEFAULT | FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE; CallbackData->BmmFakeNvData->BootNext = Index; } else { - IfrOptionList[Index].Flags = EFI_IFR_FLAG_INTERACTIVE; + IfrOptionList[Index].Flags = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE; } IfrOptionList[Index].Key = (UINT16) KEY_VALUE_MAIN_BOOT_NEXT; @@ -603,9 +603,9 @@ UpdateBootNextPage ( IfrOptionList[Index].Key = (UINT16) KEY_VALUE_MAIN_BOOT_NEXT; IfrOptionList[Index].Value = Index; IfrOptionList[Index].StringToken = STRING_TOKEN (STR_NONE); - IfrOptionList[Index].Flags = EFI_IFR_FLAG_INTERACTIVE; + IfrOptionList[Index].Flags = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE; if (CallbackData->BmmFakeNvData->BootNext == Index) { - IfrOptionList[Index].Flags |= EFI_IFR_FLAG_DEFAULT; + IfrOptionList[Index].Flags |= FRAMEWORK_EFI_IFR_FLAG_DEFAULT; } IfrOptionList[Index].OptionString = NULL; @@ -619,8 +619,8 @@ UpdateBootNextPage ( (UINTN) (NumberOfOptions + 1), Location ); - Location = Location + (NumberOfOptions + 2) * ((EFI_IFR_OP_HEADER *) Location)->Length; - Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + (NumberOfOptions + 2) * ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; UpdateData->DataCount += 3; SafeFreePool (IfrOptionList); @@ -661,7 +661,7 @@ UpdateTimeOutPage ( CallbackData->BmmFakeNvData->BootTimeOut = (UINT16) BootTimeOut; UpdateData->DataCount++; - Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; UpdatePageEnd (CallbackData, Location); } @@ -699,9 +699,9 @@ UpdateTerminalPage ( } for (Index = 0; Index < 19; Index++) { - CheckFlags = EFI_IFR_FLAG_INTERACTIVE; + CheckFlags = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE; if (NewTerminalContext->BaudRate == (UINT64) (BaudRateList[Index].Value)) { - CheckFlags |= EFI_IFR_FLAG_DEFAULT; + CheckFlags |= FRAMEWORK_EFI_IFR_FLAG_DEFAULT; NewTerminalContext->BaudRateIndex = (UINT8) Index; CallbackData->BmmFakeNvData->COMBaudRate = NewTerminalContext->BaudRateIndex; } @@ -722,8 +722,8 @@ UpdateTerminalPage ( Location ); - Location = Location + (Index + 1) * ((EFI_IFR_OP_HEADER *) Location)->Length; - Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + (Index + 1) * ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; UpdateData->DataCount = (UINT8) (UpdateData->DataCount + Index); UpdateData->DataCount += 2; @@ -735,12 +735,12 @@ UpdateTerminalPage ( } for (Index = 0; Index < 4; Index++) { - CheckFlags = EFI_IFR_FLAG_INTERACTIVE; + CheckFlags = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE; if (NewTerminalContext->DataBits == DataBitsList[Index].Value) { NewTerminalContext->DataBitsIndex = (UINT8) Index; CallbackData->BmmFakeNvData->COMDataRate = NewTerminalContext->DataBitsIndex; - CheckFlags |= EFI_IFR_FLAG_DEFAULT; + CheckFlags |= FRAMEWORK_EFI_IFR_FLAG_DEFAULT; } IfrOptionList[Index].Flags = CheckFlags; @@ -759,8 +759,8 @@ UpdateTerminalPage ( Location ); - Location = Location + (Index + 1) * ((EFI_IFR_OP_HEADER *) Location)->Length; - Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + (Index + 1) * ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; UpdateData->DataCount = (UINT8) (UpdateData->DataCount + Index); UpdateData->DataCount += 2; @@ -772,9 +772,9 @@ UpdateTerminalPage ( } for (Index = 0; Index < 5; Index++) { - CheckFlags = EFI_IFR_FLAG_INTERACTIVE; + CheckFlags = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE; if (NewTerminalContext->Parity == ParityList[Index].Value) { - CheckFlags |= EFI_IFR_FLAG_DEFAULT; + CheckFlags |= FRAMEWORK_EFI_IFR_FLAG_DEFAULT; NewTerminalContext->ParityIndex = (UINT8) Index; CallbackData->BmmFakeNvData->COMParity = NewTerminalContext->ParityIndex; } @@ -795,8 +795,8 @@ UpdateTerminalPage ( Location ); - Location = Location + (Index + 1) * ((EFI_IFR_OP_HEADER *) Location)->Length; - Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + (Index + 1) * ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; UpdateData->DataCount = (UINT8) (UpdateData->DataCount + Index); UpdateData->DataCount += 2; @@ -808,9 +808,9 @@ UpdateTerminalPage ( } for (Index = 0; Index < 3; Index++) { - CheckFlags = EFI_IFR_FLAG_INTERACTIVE; + CheckFlags = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE; if (NewTerminalContext->StopBits == StopBitsList[Index].Value) { - CheckFlags |= EFI_IFR_FLAG_DEFAULT; + CheckFlags |= FRAMEWORK_EFI_IFR_FLAG_DEFAULT; NewTerminalContext->StopBitsIndex = (UINT8) Index; CallbackData->BmmFakeNvData->COMStopBits = NewTerminalContext->StopBitsIndex; } @@ -831,8 +831,8 @@ UpdateTerminalPage ( Location ); - Location = Location + (Index + 1) * ((EFI_IFR_OP_HEADER *) Location)->Length; - Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + (Index + 1) * ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; UpdateData->DataCount = (UINT8) (UpdateData->DataCount + Index); UpdateData->DataCount += 2; @@ -844,9 +844,9 @@ UpdateTerminalPage ( } for (Index = 0; Index < 4; Index++) { - CheckFlags = EFI_IFR_FLAG_INTERACTIVE; + CheckFlags = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE; if (NewTerminalContext->TerminalType == Index) { - CheckFlags |= EFI_IFR_FLAG_DEFAULT; + CheckFlags |= FRAMEWORK_EFI_IFR_FLAG_DEFAULT; CallbackData->BmmFakeNvData->COMTerminalType = NewTerminalContext->TerminalType; } @@ -866,8 +866,8 @@ UpdateTerminalPage ( Location ); - Location = Location + (Index + 1) * ((EFI_IFR_OP_HEADER *) Location)->Length; - Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + (Index + 1) * ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; UpdateData->DataCount = (UINT8) (UpdateData->DataCount + Index); UpdateData->DataCount += 2; @@ -877,19 +877,19 @@ UpdateTerminalPage ( FORM_MAIN_ID, STRING_TOKEN (STR_SAVE_AND_EXIT), STRING_TOKEN (STR_NULL_STRING), - EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS, + FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS, KEY_VALUE_SAVE_AND_EXIT, Location ); - Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; UpdateData->DataCount++; CreateGotoOpCode ( FORM_MAIN_ID, STRING_TOKEN (STR_NO_SAVE_AND_EXIT), STRING_TOKEN (STR_NULL_STRING), - EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS, + FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS, KEY_VALUE_NO_SAVE_AND_EXIT, Location ); @@ -1129,9 +1129,9 @@ UpdateSetLegacyDeviceOrderPage ( for (Index = 0; Index < OptionMenu->MenuNumber; Index++) { NewMenuEntry = BOpt_GetMenuEntry (OptionMenu, Index); - IfrOptionList[Index].Flags = EFI_IFR_FLAG_INTERACTIVE; + IfrOptionList[Index].Flags = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE; if (0 == Index) { - IfrOptionList[Index].Flags |= EFI_IFR_FLAG_DEFAULT; + IfrOptionList[Index].Flags |= FRAMEWORK_EFI_IFR_FLAG_DEFAULT; } IfrOptionList[Index].Key = Key; @@ -1142,7 +1142,7 @@ UpdateSetLegacyDeviceOrderPage ( // // for item "Disabled" // - IfrOptionList[Index].Flags = EFI_IFR_FLAG_INTERACTIVE; + IfrOptionList[Index].Flags = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE; IfrOptionList[Index].Key = Key; IfrOptionList[Index].StringToken = STRING_TOKEN (STR_DISABLE_LEGACY_DEVICE); IfrOptionList[Index].Value = 0xFF; @@ -1220,8 +1220,8 @@ UpdateSetLegacyDeviceOrderPage ( LegacyOrder[Index] = (UINT8) (VarDevOrder & 0xFF); } - Location = Location + (OptionMenu->MenuNumber + 2) * ((EFI_IFR_OP_HEADER *) Location)->Length; - Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + (OptionMenu->MenuNumber + 2) * ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; UpdateData->DataCount = (UINT16) (UpdateData->DataCount + (OptionMenu->MenuNumber + 3)); } } diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/Variable.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/Variable.c index cac68a16b0..20d23975d1 100644 --- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/Variable.c +++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMaint/Variable.c @@ -504,7 +504,7 @@ Var_UpdateErrorOutOption ( EFI_STATUS Var_UpdateDriverOption ( IN BMM_CALLBACK_DATA *CallbackData, - IN EFI_HII_HANDLE HiiHandle, + IN FRAMEWORK_EFI_HII_HANDLE HiiHandle, IN UINT16 *DescriptionData, IN UINT16 *OptionalData, IN UINT8 ForceReconnect diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.c b/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.c index 14209b87d5..d48db10944 100644 --- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.c +++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.c @@ -24,7 +24,7 @@ Abstract: UINT16 mKeyInput; LIST_ENTRY *mBootOptionsList; BDS_COMMON_OPTION *gOption; -EFI_HII_HANDLE gBootManagerHandle; +FRAMEWORK_EFI_HII_HANDLE gBootManagerHandle; EFI_HANDLE BootManagerCallbackHandle; EFI_FORM_CALLBACK_PROTOCOL BootManagerCallback; EFI_GUID gBmGuid = BOOT_MANAGER_GUID; @@ -38,7 +38,7 @@ EFIAPI BootManagerCallbackRoutine ( IN EFI_FORM_CALLBACK_PROTOCOL *This, IN UINT16 KeyValue, - IN EFI_IFR_DATA_ARRAY *DataArray, + IN FRAMEWORK_EFI_IFR_DATA_ARRAY *DataArray, OUT EFI_HII_CALLBACK_PACKET **Packet ) /*++ @@ -97,7 +97,7 @@ Returns: DataPacket->DataArray.EntryCount = 1; DataPacket->DataArray.NvRamMap = NULL; - ((EFI_IFR_DATA_ENTRY *) (((EFI_IFR_DATA_ARRAY *)DataPacket) + 1))->Flags = EXIT_REQUIRED | NV_NOT_CHANGED; + ((FRAMEWORK_EFI_IFR_DATA_ENTRY *) (((FRAMEWORK_EFI_IFR_DATA_ARRAY *)DataPacket) + 1))->Flags = EXIT_REQUIRED | NV_NOT_CHANGED; return EFI_SUCCESS; } else { continue; @@ -265,13 +265,13 @@ Returns: 0x1000, // Form ID Token, // Token Value for the string 0, // Help String (none) - EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS, // The Op-Code flags + FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS, // The Op-Code flags mKeyInput, // The Key to get a callback on Location // Buffer containing created op-code ); UpdateData->DataCount++; - Location = Location + ((EFI_IFR_OP_HEADER *) Location)->Length; + Location = Location + ((FRAMEWORK_EFI_IFR_OP_HEADER *) Location)->Length; } diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.h b/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.h index fd9b5a1f34..8c734afb6d 100644 --- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.h +++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.h @@ -33,7 +33,7 @@ EFIAPI BootManagerCallbackRoutine ( IN EFI_FORM_CALLBACK_PROTOCOL *This, IN UINT16 KeyValue, - IN EFI_IFR_DATA_ARRAY *DataArray, + IN FRAMEWORK_EFI_IFR_DATA_ARRAY *DataArray, OUT EFI_HII_CALLBACK_PACKET **Packet ); diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.c b/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.c index f990350781..4c03d8dc83 100644 --- a/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.c +++ b/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.c @@ -42,7 +42,7 @@ EFIAPI DeviceManagerCallbackRoutine ( IN EFI_FORM_CALLBACK_PROTOCOL *This, IN UINT16 KeyValue, - IN EFI_IFR_DATA_ARRAY *DataArray, + IN FRAMEWORK_EFI_IFR_DATA_ARRAY *DataArray, OUT EFI_HII_CALLBACK_PACKET **Packet ) /*++ @@ -73,7 +73,7 @@ Returns: CallbackInfo = EFI_FP_CALLBACK_DATA_FROM_THIS (This); switch (KeyValue) { case 0x2000: - CallbackInfo->Data.VideoBIOS = (UINT8) (UINTN) (((EFI_IFR_DATA_ENTRY *)(DataArray + 1))->Data); + CallbackInfo->Data.VideoBIOS = (UINT8) (UINTN) (((FRAMEWORK_EFI_IFR_DATA_ENTRY *)(DataArray + 1))->Data); gRT->SetVariable ( L"VBIOS", &gEfiGenericPlatformVariableGuid, @@ -184,9 +184,9 @@ Returns: EFI_STATUS Status; UINTN BufferSize; UINTN Count; - EFI_HII_HANDLE Index; + FRAMEWORK_EFI_HII_HANDLE Index; UINT8 *Buffer; - EFI_IFR_FORM_SET *FormSetData; + FRAMEWORK_EFI_IFR_FORM_SET *FormSetData; CHAR16 *String; UINTN StringLength; EFI_HII_UPDATE_DATA *UpdateData; @@ -195,7 +195,7 @@ Returns: IFR_OPTION *IfrOptionList; UINT8 *VideoOption; UINTN VideoOptionSize; - EFI_HII_HANDLE *HiiHandles; + FRAMEWORK_EFI_HII_HANDLE *HiiHandles; UINT16 HandleBufferLength; BOOLEAN BootDeviceMngrMenuResetRequired; @@ -296,9 +296,9 @@ Returns: Status = gHii->GetForms (gHii, Index, 0, &BufferSize, Buffer); // - // Skip EFI_HII_PACK_HEADER, advance to EFI_IFR_FORM_SET data. + // Skip EFI_HII_PACK_HEADER, advance to FRAMEWORK_EFI_IFR_FORM_SET data. // - FormSetData = (EFI_IFR_FORM_SET *) (Buffer + sizeof (EFI_HII_PACK_HEADER)); + FormSetData = (FRAMEWORK_EFI_IFR_FORM_SET *) (Buffer + sizeof (EFI_HII_PACK_HEADER)); // // If this formset belongs in the device manager, add it to the menu @@ -343,7 +343,7 @@ Returns: 0x1000, // Device Manager Page Token, // Description String Token TokenHelp, // Description Help String Token - EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS, // Flag designating callback is active + FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS, // Flag designating callback is active (UINT16) Index, // Callback key value &UpdateData->Data // Buffer to fill with op-code ); @@ -413,17 +413,17 @@ Returns: IfrOptionList = AllocatePool (2 * sizeof (IFR_OPTION)); if (IfrOptionList != NULL) { - IfrOptionList[0].Flags = EFI_IFR_FLAG_INTERACTIVE; + IfrOptionList[0].Flags = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE; IfrOptionList[0].Key = SET_VIDEO_BIOS_TYPE_QUESTION_ID + 0x2000; IfrOptionList[0].StringToken = STRING_TOKEN (STR_ONE_OF_PCI); IfrOptionList[0].Value = 0; IfrOptionList[0].OptionString = NULL; - IfrOptionList[1].Flags = EFI_IFR_FLAG_INTERACTIVE; + IfrOptionList[1].Flags = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE; IfrOptionList[1].Key = SET_VIDEO_BIOS_TYPE_QUESTION_ID + 0x2000; IfrOptionList[1].StringToken = STRING_TOKEN (STR_ONE_OF_AGP); IfrOptionList[1].Value = 1; IfrOptionList[1].OptionString = NULL; - IfrOptionList[FPCallbackInfo.Data.VideoBIOS].Flags |= EFI_IFR_FLAG_DEFAULT; + IfrOptionList[FPCallbackInfo.Data.VideoBIOS].Flags |= FRAMEWORK_EFI_IFR_FLAG_DEFAULT; CreateOneOfOpCode ( SET_VIDEO_BIOS_TYPE_QUESTION_ID, @@ -468,7 +468,7 @@ Returns: Status = gBrowser->SendForm ( gBrowser, TRUE, // Use the database - (EFI_HII_HANDLE *) &gCallbackKey, // The HII Handle + (FRAMEWORK_EFI_HII_HANDLE *) &gCallbackKey, // The HII Handle 1, NULL, NULL, // This is the handle that the interface to the callback was installed on diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.h b/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.h index dd6d935e45..be6f92a808 100644 --- a/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.h +++ b/Nt32Pkg/PlatformBdsDxe/Generic/DeviceMngr/DeviceManager.h @@ -39,7 +39,7 @@ EFIAPI DeviceManagerCallbackRoutine ( IN EFI_FORM_CALLBACK_PROTOCOL *This, IN UINT16 KeyValue, - IN EFI_IFR_DATA_ARRAY *DataArray, + IN FRAMEWORK_EFI_IFR_DATA_ARRAY *DataArray, OUT EFI_HII_CALLBACK_PACKET **Packet ) ; diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c b/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c index 2ab8bb8597..05e9ca23bd 100644 --- a/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c +++ b/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c @@ -28,21 +28,21 @@ EFI_GUID mMemorySubClass = EFI_MEMORY_SUBCLASS_GUID; EFI_GUID mMiscSubClass = EFI_MISC_SUBCLASS_GUID; UINT16 mLastSelection; -EFI_HII_HANDLE gFrontPageHandle; +FRAMEWORK_EFI_HII_HANDLE gFrontPageHandle; EFI_HANDLE FrontPageCallbackHandle; EFI_FORM_CALLBACK_PROTOCOL FrontPageCallback; EFI_FORM_BROWSER_PROTOCOL *gBrowser; UINTN gCallbackKey; BOOLEAN gConnectAllHappened = FALSE; -extern EFI_HII_HANDLE gFrontPageHandle; +extern FRAMEWORK_EFI_HII_HANDLE gFrontPageHandle; EFI_STATUS EFIAPI FrontPageCallbackRoutine ( IN EFI_FORM_CALLBACK_PROTOCOL *This, IN UINT16 KeyValue, - IN EFI_IFR_DATA_ARRAY *DataArray, + IN FRAMEWORK_EFI_IFR_DATA_ARRAY *DataArray, OUT EFI_HII_CALLBACK_PACKET **Packet ) /*++ @@ -105,7 +105,7 @@ Returns: // Based on the DataArray->Data->Data value, we can determine // which language was chosen by the user // - for (Index = 0; Count != (UINTN) (((EFI_IFR_DATA_ENTRY *) (DataArray + 1))->Data); Index += 3) { + for (Index = 0; Count != (UINTN) (((FRAMEWORK_EFI_IFR_DATA_ENTRY *) (DataArray + 1))->Data); Index += 3) { Count++; } // @@ -174,7 +174,7 @@ Returns: Background, TmpStr, Color, - (UINTN) (((EFI_IFR_DATA_ENTRY *) (DataArray+1))->Data), + (UINTN) (((FRAMEWORK_EFI_IFR_DATA_ENTRY *) (DataArray+1))->Data), 0 ); FreePool (TmpStr); @@ -243,7 +243,7 @@ Returns: // TempBuffer = (UINT8 *) FrontPageVfrBin; TempBuffer = TempBuffer + sizeof (EFI_HII_PACK_HEADER); - TempBuffer = (UINT8 *) &((EFI_IFR_FORM_SET *) TempBuffer)->NvDataSize; + TempBuffer = (UINT8 *) &((FRAMEWORK_EFI_IFR_FORM_SET *) TempBuffer)->NvDataSize; *TempBuffer = 1; gCallbackKey = 0; @@ -354,7 +354,7 @@ ReInitStrings: CopyMem (&OptionList[OptionCount].Value, &OptionCount, sizeof (UINT16)); Key = 0x1234; CopyMem (&OptionList[OptionCount].Key, &Key, sizeof (UINT16)); - OptionList[OptionCount].Flags = EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_NV_ACCESS; + OptionList[OptionCount].Flags = FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS; OptionCount++; } @@ -468,7 +468,7 @@ Returns: { EFI_STATUS Status; UINT16 HandleBufferLength; - EFI_HII_HANDLE *HiiHandleBuffer; + FRAMEWORK_EFI_HII_HANDLE *HiiHandleBuffer; UINTN StringBufferLength; UINTN NumberOfHiiHandles; UINTN Index; @@ -490,7 +490,7 @@ Returns: // // Get the gHii Handle that matches the StructureNode->ProducerName // - NumberOfHiiHandles = HandleBufferLength / sizeof (EFI_HII_HANDLE); + NumberOfHiiHandles = HandleBufferLength / sizeof (FRAMEWORK_EFI_HII_HANDLE ); for (Index = 0; Index < NumberOfHiiHandles; Index++) { Length = 0; Status = ExtractDataFromHiiHandle ( @@ -790,7 +790,7 @@ Returns: CreateBannerOpCode ( STRING_TOKEN (STR_TIME_OUT_PROMPT), TimeoutDefault, - (UINT8) EFI_IFR_BANNER_TIMEOUT, + (UINT8) FRAMEWORK_EFI_IFR_BANNER_TIMEOUT, &UpdateData->Data ); diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.h b/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.h index 0f673f0956..b39d996a8a 100644 --- a/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.h +++ b/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.h @@ -59,7 +59,7 @@ typedef struct { typedef struct { UINTN Signature; MyDevMgrIfrNVData Data; - EFI_HII_HANDLE DevMgrHiiHandle; + FRAMEWORK_EFI_HII_HANDLE DevMgrHiiHandle; EFI_HANDLE CallbackHandle; EFI_FORM_CALLBACK_PROTOCOL DevMgrCallback; } EFI_FRONTPAGE_CALLBACK_INFO; -- cgit v1.2.3