From aa2ebe0fa99175c68e60ae3b0a6eef562c9235d8 Mon Sep 17 00:00:00 2001 From: lgao4 Date: Mon, 13 Jul 2009 09:28:09 +0000 Subject: [PATCH 1/1] Remove unnecessary FRAMEWORK_ prefix in IntelFrameworkPkg definitions for those definitions that don't conflict with ones in UEFI/PI specification. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8924 6f19259b-4bc3-4df7-8a09-765794883524 --- .../FrameworkHiiOnUefiHiiThunk/ConfigAccess.c | 36 +++++------ .../FrameworkHiiOnUefiHiiThunk/Forms.c | 6 +- .../FrameworkHiiOnUefiHiiThunk/HiiDatabase.h | 2 +- .../OpcodeCreation.c | 60 +++++++++---------- .../FrameworkHiiOnUefiHiiThunk/SetupBrowser.c | 2 +- .../UefiIfrDefault.c | 16 ++--- 6 files changed, 61 insertions(+), 61 deletions(-) diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c index 2dd202bb39..3efda6703a 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c @@ -645,8 +645,8 @@ Done: } /** - Build the FRAMEWORK_EFI_IFR_DATA_ARRAY which will be used to pass to - EFI_FORM_CALLBACK_PROTOCOL.Callback. Check definition of FRAMEWORK_EFI_IFR_DATA_ARRAY + Build the EFI_IFR_DATA_ARRAY which will be used to pass to + EFI_FORM_CALLBACK_PROTOCOL.Callback. Check definition of EFI_IFR_DATA_ARRAY for details. ASSERT if the Question Type is not EFI_IFR_TYPE_NUM_SIZE_* or EFI_IFR_TYPE_STRING. @@ -657,9 +657,9 @@ Done: @param Value The Question Value. @param NvMapAllocated On output indicates if a buffer is allocated for NvMap. - @return A pointer to FRAMEWORK_EFI_IFR_DATA_ARRAY. The caller must free this buffer allocated. + @return A pointer to EFI_IFR_DATA_ARRAY. The caller must free this buffer allocated. **/ -FRAMEWORK_EFI_IFR_DATA_ARRAY * +EFI_IFR_DATA_ARRAY * CreateIfrDataArray ( IN CONFIG_ACCESS_PRIVATE *ConfigAccess, IN EFI_QUESTION_ID QuestionId, @@ -668,8 +668,8 @@ CreateIfrDataArray ( OUT BOOLEAN *NvMapAllocated ) { - FRAMEWORK_EFI_IFR_DATA_ARRAY *IfrDataArray; - FRAMEWORK_EFI_IFR_DATA_ENTRY *IfrDataEntry; + EFI_IFR_DATA_ARRAY *IfrDataArray; + EFI_IFR_DATA_ENTRY *IfrDataEntry; UINTN BrowserDataSize; FORMSET_STORAGE *BufferStorage; UINTN Size; @@ -705,7 +705,7 @@ CreateIfrDataArray ( break; } - IfrDataArray = AllocateZeroPool (sizeof (FRAMEWORK_EFI_IFR_DATA_ARRAY) + sizeof (FRAMEWORK_EFI_IFR_DATA_ENTRY) + Size); + IfrDataArray = AllocateZeroPool (sizeof (EFI_IFR_DATA_ARRAY) + sizeof (EFI_IFR_DATA_ENTRY) + Size); ASSERT (IfrDataArray != NULL); BufferStorage = GetStorageFromQuestionId (ConfigAccess->ThunkContext->FormSet, QuestionId); @@ -730,7 +730,7 @@ CreateIfrDataArray ( } ASSERT (HiiGetBrowserData (&BufferStorage->Guid, BufferStorage->Name, BrowserDataSize, (UINT8 *) IfrDataArray->NvRamMap)); - IfrDataEntry = (FRAMEWORK_EFI_IFR_DATA_ENTRY *) (IfrDataArray + 1); + IfrDataEntry = (EFI_IFR_DATA_ENTRY *) (IfrDataArray + 1); switch (Type) { case EFI_IFR_TYPE_NUM_SIZE_8: @@ -754,11 +754,11 @@ CreateIfrDataArray ( } // - // Need to fiil in the information for the rest of field for FRAMEWORK_EFI_IFR_DATA_ENTRY. + // Need to fiil in the information for the rest of field for EFI_IFR_DATA_ENTRY. // It seems that no implementation is found to use other fields. Leave them uninitialized for now. // //UINT8 OpCode; // Likely a string, numeric, or one-of - //UINT8 Length; // Length of the FRAMEWORK_EFI_IFR_DATA_ENTRY packet + //UINT8 Length; // Length of the EFI_IFR_DATA_ENTRY packet //UINT16 Flags; // Flags settings to determine what behavior is desired from the browser after the callback //VOID *Data; // The data in the form based on the op-code type - this is not a pointer to the data, the data follows immediately // If the OpCode is a OneOf or Numeric type - Data is a UINT16 value @@ -817,15 +817,15 @@ SyncBrowserDataForNvMapOverride ( } /** - Free up resource allocated for a FRAMEWORK_EFI_IFR_DATA_ARRAY by CreateIfrDataArray (). + Free up resource allocated for a EFI_IFR_DATA_ARRAY by CreateIfrDataArray (). - @param Array The FRAMEWORK_EFI_IFR_DATA_ARRAY allocated. - @param NvMapAllocated If the NvRamMap is allocated for FRAMEWORK_EFI_IFR_DATA_ARRAY. + @param Array The EFI_IFR_DATA_ARRAY allocated. + @param NvMapAllocated If the NvRamMap is allocated for EFI_IFR_DATA_ARRAY. **/ VOID DestroyIfrDataArray ( - IN FRAMEWORK_EFI_IFR_DATA_ARRAY *Array, + IN EFI_IFR_DATA_ARRAY *Array, IN BOOLEAN NvMapAllocated ) { @@ -988,8 +988,8 @@ ThunkCallback ( CONFIG_ACCESS_PRIVATE *ConfigAccess; EFI_FORM_CALLBACK_PROTOCOL *FormCallbackProtocol; EFI_HII_CALLBACK_PACKET *Packet; - FRAMEWORK_EFI_IFR_DATA_ARRAY *Data; - FRAMEWORK_EFI_IFR_DATA_ENTRY *DataEntry; + EFI_IFR_DATA_ARRAY *Data; + EFI_IFR_DATA_ENTRY *DataEntry; UINT16 KeyValue; ONE_OF_OPTION_MAP_ENTRY *OneOfOptionMapEntry; EFI_HANDLE NotifyHandle; @@ -1028,7 +1028,7 @@ ThunkCallback ( } // - // Build the FRAMEWORK_EFI_IFR_DATA_ARRAY + // Build the EFI_IFR_DATA_ARRAY // Data = CreateIfrDataArray (ConfigAccess, QuestionId, Type, Value, &NvMapAllocated); @@ -1067,7 +1067,7 @@ ThunkCallback ( } else { if (Packet != NULL) { if (Packet->DataArray.EntryCount == 1 && Packet->DataArray.NvRamMap == NULL) { - DataEntry = (FRAMEWORK_EFI_IFR_DATA_ENTRY *) ((UINT8 *) Packet + sizeof (FRAMEWORK_EFI_IFR_DATA_ARRAY)); + DataEntry = (EFI_IFR_DATA_ENTRY *) ((UINT8 *) Packet + sizeof (EFI_IFR_DATA_ARRAY)); if ((DataEntry->Flags & EXIT_REQUIRED) == EXIT_REQUIRED) { *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT; } diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Forms.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Forms.c index d39001f981..b4c110bd12 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Forms.c +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Forms.c @@ -23,7 +23,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. typedef struct { EFI_HII_PACK_HEADER PackageHeader; FRAMEWORK_EFI_IFR_FORM_SET FormSet; - FRAMEWORK_EFI_IFR_END_FORM_SET EndFormSet; + EFI_IFR_END_FORM_SET EndFormSet; } FW_HII_FORMSET_TEMPLATE; #pragma pack() @@ -47,8 +47,8 @@ FW_HII_FORMSET_TEMPLATE FormSetTemplate = { }, { { - FRAMEWORK_EFI_IFR_END_FORM_SET_OP, - sizeof (FRAMEWORK_EFI_IFR_END_FORM_SET) + EFI_IFR_END_FORM_SET_OP, + sizeof (EFI_IFR_END_FORM_SET) } } }; diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h index 9b07b29c83..ced2ad326f 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h @@ -407,7 +407,7 @@ ThunkSendForm ( IN BOOLEAN UseDatabase, IN FRAMEWORK_EFI_HII_HANDLE *Handle, IN UINTN HandleCount, - IN FRAMEWORK_EFI_IFR_PACKET *Packet, OPTIONAL + IN EFI_IFR_PACKET *Packet, OPTIONAL IN EFI_HANDLE CallbackHandle, OPTIONAL IN UINT8 *NvMapOverride, OPTIONAL IN FRAMEWORK_EFI_SCREEN_DESCRIPTOR *ScreenDimensions, OPTIONAL diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/OpcodeCreation.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/OpcodeCreation.c index 3ac7211579..7a14b9c68a 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/OpcodeCreation.c +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/OpcodeCreation.c @@ -58,7 +58,7 @@ QuestionOpFwToUefi ( } } - *UefiOp = (UINT8) (FRAMEWORK_EFI_IFR_LAST_OPCODE + 1); + *UefiOp = (UINT8) (EFI_IFR_LAST_OPCODE + 1); return EFI_NOT_FOUND; } @@ -184,7 +184,7 @@ F2UCreateTextOpCode ( { EFI_IFR_TEXT UTextOpCode; - if ((FwOpcode->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) == 0) { + if ((FwOpcode->Flags & EFI_IFR_FLAG_INTERACTIVE) == 0) { ZeroMem (&UTextOpCode, sizeof(UTextOpCode)); UTextOpCode.Header.OpCode = EFI_IFR_TEXT_OP; @@ -234,10 +234,10 @@ F2UCreateReferenceOpCode ( UOpcode.FormId = FwOpcode->FormId; // - // We only map FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE and FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED to + // We only map EFI_IFR_FLAG_INTERACTIVE and EFI_IFR_FLAG_RESET_REQUIRED to // UEFI IFR Opcode flags. The rest flags are obsolete. // - UOpcode.Question.Flags = (UINT8) (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED)); + UOpcode.Question.Flags = (UINT8) (FwOpcode->Flags & (EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_RESET_REQUIRED)); return HiiCreateRawOpCodes (UefiUpdateDataHandle, (UINT8 *) &UOpcode, sizeof(UOpcode)); } @@ -271,12 +271,12 @@ F2UCreateOneOfOptionOpCode ( CopyMem (&UOpcode.Value.u8, &FwOpcode->Value, Width); // - // #define FRAMEWORK_EFI_IFR_FLAG_DEFAULT 0x01 - // #define FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING 0x02 + // #define EFI_IFR_FLAG_DEFAULT 0x01 + // #define EFI_IFR_FLAG_MANUFACTURING 0x02 // #define EFI_IFR_OPTION_DEFAULT 0x10 // #define EFI_IFR_OPTION_DEFAULT_MFG 0x20 // - UOpcode.Flags = (UINT8) (UOpcode.Flags | (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_DEFAULT | FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING)) << 4); + UOpcode.Flags = (UINT8) (UOpcode.Flags | (FwOpcode->Flags & (EFI_IFR_FLAG_DEFAULT | EFI_IFR_FLAG_MANUFACTURING)) << 4); switch (Width) { case 1: @@ -339,7 +339,7 @@ CreateGuidOptionKeyOpCode ( @param ThunkContext The HII Thunk Context. @param FwOpcode The input Framework Opcode. @param UefiUpdateDataHandle The newly created UEFI HII opcode is appended to UefiUpdateDataHandle. - @param NextFwOpcode Returns the position of the next Framework Opcode after FRAMEWORK_EFI_IFR_END_ONE_OF_OP of + @param NextFwOpcode Returns the position of the next Framework Opcode after EFI_IFR_END_ONE_OF_OP of the "One Of Option". @param OpcodeCount The number of Opcode for the complete Framework "One Of" Opcode. @@ -382,11 +382,11 @@ F2UCreateOneOfOpCode ( // Go over the Framework IFR binary to get the QuestionId for generated UEFI One Of Option opcode // FwOpHeader = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((UINT8 *) FwOpcode + FwOpcode->Header.Length); - while (FwOpHeader->OpCode != FRAMEWORK_EFI_IFR_END_ONE_OF_OP) { + while (FwOpHeader->OpCode != EFI_IFR_END_ONE_OF_OP) { ASSERT (FwOpHeader->OpCode == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP); FwOneOfOp = (FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FwOpHeader; - if ((FwOneOfOp->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) != 0) { + if ((FwOneOfOp->Flags & EFI_IFR_FLAG_INTERACTIVE) != 0) { UOpcode.Question.Flags |= EFI_IFR_FLAG_CALLBACK; if (UOpcode.Question.QuestionId == 0) { @@ -398,7 +398,7 @@ F2UCreateOneOfOpCode ( } - if (FwOneOfOp->Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED) { + if (FwOneOfOp->Flags & EFI_IFR_FLAG_RESET_REQUIRED) { UOpcode.Question.Flags |= EFI_IFR_FLAG_RESET_REQUIRED; } @@ -426,7 +426,7 @@ F2UCreateOneOfOpCode ( // Go over again the Framework IFR binary to build the UEFI One Of Option opcodes. // FwOpHeader = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((UINT8 *) FwOpcode + FwOpcode->Header.Length); - while (FwOpHeader->OpCode != FRAMEWORK_EFI_IFR_END_ONE_OF_OP) { + while (FwOpHeader->OpCode != EFI_IFR_END_ONE_OF_OP) { FwOneOfOp = (FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FwOpHeader; @@ -459,7 +459,7 @@ F2UCreateOneOfOpCode ( @param ThunkContext The HII Thunk Context. @param FwOpcode The input Framework Opcode. @param UefiUpdateDataHandle The newly created UEFI HII opcode is appended to UefiUpdateDataHandle. - @param NextFwOpcode Returns the position of the next Framework Opcode after FRAMEWORK_EFI_IFR_END_ONE_OF_OP of + @param NextFwOpcode Returns the position of the next Framework Opcode after EFI_IFR_END_ONE_OF_OP of the "Ordered List". @param OpcodeCount The number of Opcode for the complete Framework "Ordered List" Opcode. @@ -501,11 +501,11 @@ F2UCreateOrderedListOpCode ( // Go over the Framework IFR binary to get the QuestionId for generated UEFI One Of Option opcode // FwOpHeader = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((UINT8 *) FwOpcode + FwOpcode->Header.Length); - while (FwOpHeader->OpCode != FRAMEWORK_EFI_IFR_END_ONE_OF_OP) { + while (FwOpHeader->OpCode != EFI_IFR_END_ONE_OF_OP) { ASSERT (FwOpHeader->OpCode == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP); FwOneOfOp = (FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FwOpHeader; - if ((FwOneOfOp->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) != 0) { + if ((FwOneOfOp->Flags & EFI_IFR_FLAG_INTERACTIVE) != 0) { UOpcode.Question.Flags |= EFI_IFR_FLAG_CALLBACK; if (UOpcode.Question.QuestionId == 0) { @@ -517,7 +517,7 @@ F2UCreateOrderedListOpCode ( } } - if (FwOneOfOp->Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED) { + if (FwOneOfOp->Flags & EFI_IFR_FLAG_RESET_REQUIRED) { UOpcode.Question.Flags |= EFI_IFR_FLAG_RESET_REQUIRED; } @@ -538,7 +538,7 @@ F2UCreateOrderedListOpCode ( *OpcodeCount += 1; FwOpHeader = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((UINT8 *) FwOpcode + FwOpcode->Header.Length); - while (FwOpHeader->OpCode != FRAMEWORK_EFI_IFR_END_ONE_OF_OP) { + while (FwOpHeader->OpCode != EFI_IFR_END_ONE_OF_OP) { // // Each entry of Order List in Framework HII is always 1 byte in size // @@ -602,11 +602,11 @@ F2UCreateCheckBoxOpCode ( // // We map 2 flags: - // FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE, - // FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED, + // EFI_IFR_FLAG_INTERACTIVE, + // EFI_IFR_FLAG_RESET_REQUIRED, // to UEFI IFR Opcode Question flags. The rest flags are obsolete. // - UOpcode.Question.Flags = (UINT8) (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED)); + UOpcode.Question.Flags = (UINT8) (FwOpcode->Flags & (EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_RESET_REQUIRED)); UOpcode.Question.VarStoreId = ThunkContext->FormSet->DefaultVarStoreId; @@ -614,11 +614,11 @@ F2UCreateCheckBoxOpCode ( // // We also map these 2 flags: - // FRAMEWORK_EFI_IFR_FLAG_DEFAULT, - // FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING, + // EFI_IFR_FLAG_DEFAULT, + // EFI_IFR_FLAG_MANUFACTURING, // to UEFI IFR CheckBox Opcode default flags. // - UOpcode.Flags = (UINT8) (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_DEFAULT | FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING)); + UOpcode.Flags = (UINT8) (FwOpcode->Flags & (EFI_IFR_FLAG_DEFAULT | EFI_IFR_FLAG_MANUFACTURING)); return HiiCreateRawOpCodes (UefiUpdateDataHandle, (UINT8 *) &UOpcode, sizeof(UOpcode)); } @@ -676,7 +676,7 @@ F2UCreateNumericOpCode ( UOpcode.Question.VarStoreId = ThunkContext->FormSet->DefaultVarStoreId; UOpcode.Question.VarStoreInfo.VarOffset = FwOpcode->QuestionId; - UOpcode.Question.Flags = (UINT8) (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED)); + UOpcode.Question.Flags = (UINT8) (FwOpcode->Flags & (EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_RESET_REQUIRED)); // // Framework Numeric values are all in UINT16 and displayed as decimal. @@ -787,7 +787,7 @@ F2UCreateStringOpCode ( UOpcode.Question.Header.Prompt = FwOpcode->Prompt; UOpcode.Question.Header.Help = FwOpcode->Help; - UOpcode.Question.Flags = (UINT8) (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED)); + UOpcode.Question.Flags = (UINT8) (FwOpcode->Flags & (EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_RESET_REQUIRED)); UOpcode.Question.VarStoreId = ThunkContext->FormSet->DefaultVarStoreId; UOpcode.Question.VarStoreInfo.VarOffset = FwOpcode->QuestionId; @@ -811,8 +811,8 @@ F2UCreateStringOpCode ( **/ UINT8 * F2UCreateBannerOpCode ( - IN OUT VOID *UefiUpdateDataHandle, - IN CONST FRAMEWORK_EFI_IFR_BANNER *FwOpcode + IN OUT VOID *UefiUpdateDataHandle, + IN CONST EFI_IFR_BANNER *FwOpcode ) { EFI_IFR_GUID_BANNER *UOpcode; @@ -907,12 +907,12 @@ FwUpdateDataToUefiUpdateData ( DataCount = 1; break; - case FRAMEWORK_EFI_IFR_BANNER_OP: - OpCodeBuffer = F2UCreateBannerOpCode (UefiOpCodeHandle, (FRAMEWORK_EFI_IFR_BANNER *) FwOpCode); + case EFI_IFR_BANNER_OP: + OpCodeBuffer = F2UCreateBannerOpCode (UefiOpCodeHandle, (EFI_IFR_BANNER *) FwOpCode); DataCount = 1; break; - case FRAMEWORK_EFI_IFR_END_ONE_OF_OP: + case EFI_IFR_END_ONE_OF_OP: OpCodeBuffer = HiiCreateEndOpCode (UefiOpCodeHandle); DataCount = 1; break; diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.c index 43d1b9c0f4..b16d25797b 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.c +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.c @@ -412,7 +412,7 @@ ThunkSendForm ( IN BOOLEAN UseDatabase, IN FRAMEWORK_EFI_HII_HANDLE *Handle, IN UINTN HandleCount, - IN FRAMEWORK_EFI_IFR_PACKET *Packet, OPTIONAL + IN EFI_IFR_PACKET *Packet, OPTIONAL IN EFI_HANDLE CallbackHandle, OPTIONAL IN UINT8 *NvMapOverride, OPTIONAL IN FRAMEWORK_EFI_SCREEN_DESCRIPTOR *ScreenDimensions, OPTIONAL diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/UefiIfrDefault.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/UefiIfrDefault.c index e1924791af..9dc7d2eb6d 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/UefiIfrDefault.c +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/UefiIfrDefault.c @@ -388,16 +388,16 @@ UefiIfrGetBufferTypeDefaults ( which contains the default values retrived from a UEFI form set. @param DefaultMask The default mask. - The valid values are FRAMEWORK_EFI_IFR_FLAG_DEFAULT - and FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING. - UEFI spec only map FRAMEWORK_EFI_IFR_FLAG_DEFAULT and FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING + The valid values are EFI_IFR_FLAG_DEFAULT + and EFI_IFR_FLAG_MANUFACTURING. + UEFI spec only map EFI_IFR_FLAG_DEFAULT and EFI_IFR_FLAG_MANUFACTURING from specification to valid default class. @param VariablePackList The output default value in a format defined in Framework. @retval EFI_SUCCESS Successful. - @retval EFI_INVALID_PARAMETER The default mask is not FRAMEWORK_EFI_IFR_FLAG_DEFAULT or - FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING. + @retval EFI_INVALID_PARAMETER The default mask is not EFI_IFR_FLAG_DEFAULT or + EFI_IFR_FLAG_MANUFACTURING. **/ EFI_STATUS UefiDefaultsToFwDefaults ( @@ -416,13 +416,13 @@ UefiDefaultsToFwDefaults ( EFI_HII_VARIABLE_PACK_LIST *PackList; UINTN Index; - if (DefaultMask == FRAMEWORK_EFI_IFR_FLAG_DEFAULT) { + if (DefaultMask == EFI_IFR_FLAG_DEFAULT) { DefaultId = EFI_HII_DEFAULT_CLASS_STANDARD; - } else if (DefaultMask == FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING) { + } else if (DefaultMask == EFI_IFR_FLAG_MANUFACTURING) { DefaultId = EFI_HII_DEFAULT_CLASS_MANUFACTURING; } else { // - // UEFI spec only map FRAMEWORK_EFI_IFR_FLAG_DEFAULT and FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING + // UEFI spec only map EFI_IFR_FLAG_DEFAULT and EFI_IFR_FLAG_MANUFACTURING // from specification to valid default class. // ASSERT (FALSE); -- 2.39.2