Remove unnecessary FRAMEWORK_ prefix in IntelFrameworkPkg definitions for those defin...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8924 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c
index 2dd202bb390aa9b30eec8fec379b5d65e8872624..3efda6703a7b223d7cf7f437270be29727840e18 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c
@@ -645,8 +645,8 @@ Done:
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Build the FRAMEWORK_EFI_IFR_DATA_ARRAY which will be used to pass to \r
-  EFI_FORM_CALLBACK_PROTOCOL.Callback. Check definition of FRAMEWORK_EFI_IFR_DATA_ARRAY\r
+  Build the EFI_IFR_DATA_ARRAY which will be used to pass to \r
+  EFI_FORM_CALLBACK_PROTOCOL.Callback. Check definition of EFI_IFR_DATA_ARRAY\r

   for details.\r
 \r
   ASSERT if the Question Type is not EFI_IFR_TYPE_NUM_SIZE_* or EFI_IFR_TYPE_STRING.\r
   for details.\r
 \r
   ASSERT if the Question Type is not EFI_IFR_TYPE_NUM_SIZE_* or EFI_IFR_TYPE_STRING.\r


@@ -657,9 +657,9 @@ Done:
    @param Value            The Question Value.\r
    @param NvMapAllocated   On output indicates if a buffer is allocated for NvMap.\r
    \r
    @param Value            The Question Value.\r
    @param NvMapAllocated   On output indicates if a buffer is allocated for NvMap.\r
    \r

-   @return A pointer to FRAMEWORK_EFI_IFR_DATA_ARRAY. The caller must free this buffer allocated.\r
+   @return A pointer to EFI_IFR_DATA_ARRAY. The caller must free this buffer allocated.\r

 **/   \r
 **/   \r

-FRAMEWORK_EFI_IFR_DATA_ARRAY *\r
+EFI_IFR_DATA_ARRAY *\r

 CreateIfrDataArray (\r
   IN    CONFIG_ACCESS_PRIVATE         *ConfigAccess,\r
   IN    EFI_QUESTION_ID               QuestionId,\r
 CreateIfrDataArray (\r
   IN    CONFIG_ACCESS_PRIVATE         *ConfigAccess,\r
   IN    EFI_QUESTION_ID               QuestionId,\r


@@ -668,8 +668,8 @@ CreateIfrDataArray (
   OUT   BOOLEAN                       *NvMapAllocated\r
   )\r
 {\r
   OUT   BOOLEAN                       *NvMapAllocated\r
   )\r
 {\r

-  FRAMEWORK_EFI_IFR_DATA_ARRAY      *IfrDataArray;\r
-  FRAMEWORK_EFI_IFR_DATA_ENTRY      *IfrDataEntry;\r
+  EFI_IFR_DATA_ARRAY                *IfrDataArray;\r
+  EFI_IFR_DATA_ENTRY                *IfrDataEntry;\r

   UINTN                             BrowserDataSize;\r
   FORMSET_STORAGE                   *BufferStorage;\r
   UINTN                             Size;\r
   UINTN                             BrowserDataSize;\r
   FORMSET_STORAGE                   *BufferStorage;\r
   UINTN                             Size;\r


@@ -705,7 +705,7 @@ CreateIfrDataArray (
       break;\r
   }\r
 \r
       break;\r
   }\r
 \r

-  IfrDataArray = AllocateZeroPool (sizeof (FRAMEWORK_EFI_IFR_DATA_ARRAY) + sizeof (FRAMEWORK_EFI_IFR_DATA_ENTRY) + Size);\r
+  IfrDataArray = AllocateZeroPool (sizeof (EFI_IFR_DATA_ARRAY) + sizeof (EFI_IFR_DATA_ENTRY) + Size);\r

   ASSERT (IfrDataArray != NULL);\r
 \r
   BufferStorage  = GetStorageFromQuestionId (ConfigAccess->ThunkContext->FormSet, QuestionId);\r
   ASSERT (IfrDataArray != NULL);\r
 \r
   BufferStorage  = GetStorageFromQuestionId (ConfigAccess->ThunkContext->FormSet, QuestionId);\r


@@ -730,7 +730,7 @@ CreateIfrDataArray (
     }\r
     \r
     ASSERT (HiiGetBrowserData (&BufferStorage->Guid, BufferStorage->Name, BrowserDataSize, (UINT8 *) IfrDataArray->NvRamMap));\r
     }\r
     \r
     ASSERT (HiiGetBrowserData (&BufferStorage->Guid, BufferStorage->Name, BrowserDataSize, (UINT8 *) IfrDataArray->NvRamMap));\r

-    IfrDataEntry = (FRAMEWORK_EFI_IFR_DATA_ENTRY *) (IfrDataArray + 1);\r
+    IfrDataEntry = (EFI_IFR_DATA_ENTRY *) (IfrDataArray + 1);\r

 \r
     switch (Type) {\r
       case EFI_IFR_TYPE_NUM_SIZE_8:\r
 \r
     switch (Type) {\r
       case EFI_IFR_TYPE_NUM_SIZE_8:\r


@@ -754,11 +754,11 @@ CreateIfrDataArray (
     }\r
 \r
     //\r
     }\r
 \r
     //\r

-    // Need to fiil in the information for the rest of field for FRAMEWORK_EFI_IFR_DATA_ENTRY.\r
+    // Need to fiil in the information for the rest of field for EFI_IFR_DATA_ENTRY.\r

     // It seems that no implementation is found to use other fields. Leave them uninitialized for now.\r
     //\r
     //UINT8   OpCode;           // Likely a string, numeric, or one-of\r
     // It seems that no implementation is found to use other fields. Leave them uninitialized for now.\r
     //\r
     //UINT8   OpCode;           // Likely a string, numeric, or one-of\r

-    //UINT8   Length;           // Length of the FRAMEWORK_EFI_IFR_DATA_ENTRY packet\r
+    //UINT8   Length;           // Length of the EFI_IFR_DATA_ENTRY packet\r

     //UINT16  Flags;            // Flags settings to determine what behavior is desired from the browser after the callback\r
     //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\r
     // If the OpCode is a OneOf or Numeric type - Data is a UINT16 value\r
     //UINT16  Flags;            // Flags settings to determine what behavior is desired from the browser after the callback\r
     //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\r
     // If the OpCode is a OneOf or Numeric type - Data is a UINT16 value\r


@@ -817,15 +817,15 @@ SyncBrowserDataForNvMapOverride (
 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

-  Free up resource allocated for a FRAMEWORK_EFI_IFR_DATA_ARRAY by CreateIfrDataArray ().\r
+  Free up resource allocated for a EFI_IFR_DATA_ARRAY by CreateIfrDataArray ().\r

 \r
 \r

-  @param Array              The FRAMEWORK_EFI_IFR_DATA_ARRAY allocated.\r
-  @param NvMapAllocated     If the NvRamMap is allocated for FRAMEWORK_EFI_IFR_DATA_ARRAY.\r
+  @param Array              The EFI_IFR_DATA_ARRAY allocated.\r
+  @param NvMapAllocated     If the NvRamMap is allocated for EFI_IFR_DATA_ARRAY.\r

 \r
 **/\r
 VOID\r
 DestroyIfrDataArray (\r
 \r
 **/\r
 VOID\r
 DestroyIfrDataArray (\r

-  IN  FRAMEWORK_EFI_IFR_DATA_ARRAY *Array,\r
+  IN  EFI_IFR_DATA_ARRAY           *Array,\r

   IN  BOOLEAN                      NvMapAllocated\r
   )\r
 {\r
   IN  BOOLEAN                      NvMapAllocated\r
   )\r
 {\r


@@ -988,8 +988,8 @@ ThunkCallback (
   CONFIG_ACCESS_PRIVATE                       *ConfigAccess;\r
   EFI_FORM_CALLBACK_PROTOCOL                  *FormCallbackProtocol;\r
   EFI_HII_CALLBACK_PACKET                     *Packet;\r
   CONFIG_ACCESS_PRIVATE                       *ConfigAccess;\r
   EFI_FORM_CALLBACK_PROTOCOL                  *FormCallbackProtocol;\r
   EFI_HII_CALLBACK_PACKET                     *Packet;\r

-  FRAMEWORK_EFI_IFR_DATA_ARRAY                *Data;\r
-  FRAMEWORK_EFI_IFR_DATA_ENTRY                *DataEntry;\r
+  EFI_IFR_DATA_ARRAY                          *Data;\r
+  EFI_IFR_DATA_ENTRY                          *DataEntry;\r

   UINT16                                      KeyValue;\r
   ONE_OF_OPTION_MAP_ENTRY                     *OneOfOptionMapEntry;\r
   EFI_HANDLE                                  NotifyHandle;\r
   UINT16                                      KeyValue;\r
   ONE_OF_OPTION_MAP_ENTRY                     *OneOfOptionMapEntry;\r
   EFI_HANDLE                                  NotifyHandle;\r


@@ -1028,7 +1028,7 @@ ThunkCallback (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // Build the FRAMEWORK_EFI_IFR_DATA_ARRAY\r
+  // Build the EFI_IFR_DATA_ARRAY\r

   //\r
   Data = CreateIfrDataArray (ConfigAccess, QuestionId, Type, Value, &NvMapAllocated);\r
 \r
   //\r
   Data = CreateIfrDataArray (ConfigAccess, QuestionId, Type, Value, &NvMapAllocated);\r
 \r


@@ -1067,7 +1067,7 @@ ThunkCallback (
   } else {\r
     if (Packet != NULL) {\r
         if (Packet->DataArray.EntryCount  == 1 && Packet->DataArray.NvRamMap == NULL) {\r
   } else {\r
     if (Packet != NULL) {\r
         if (Packet->DataArray.EntryCount  == 1 && Packet->DataArray.NvRamMap == NULL) {\r

-          DataEntry = (FRAMEWORK_EFI_IFR_DATA_ENTRY *) ((UINT8 *) Packet + sizeof (FRAMEWORK_EFI_IFR_DATA_ARRAY));\r
+          DataEntry = (EFI_IFR_DATA_ENTRY *) ((UINT8 *) Packet + sizeof (EFI_IFR_DATA_ARRAY));\r

           if ((DataEntry->Flags & EXIT_REQUIRED) == EXIT_REQUIRED) {\r
               *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
           }\r
           if ((DataEntry->Flags & EXIT_REQUIRED) == EXIT_REQUIRED) {\r
               *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;\r
           }\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Forms.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Forms.c
index d39001f981bb1eb353ea02a7d8c53e17559e0ac7..b4c110bd120152ba095904fa596be98c0b18fb3d 100644 (file)
--- 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 {\r
   EFI_HII_PACK_HEADER            PackageHeader;\r
   FRAMEWORK_EFI_IFR_FORM_SET     FormSet;\r
 typedef struct {\r
   EFI_HII_PACK_HEADER            PackageHeader;\r
   FRAMEWORK_EFI_IFR_FORM_SET     FormSet;\r

-  FRAMEWORK_EFI_IFR_END_FORM_SET EndFormSet;\r
+  EFI_IFR_END_FORM_SET           EndFormSet;\r

 } FW_HII_FORMSET_TEMPLATE;\r
 #pragma pack()\r
 \r
 } FW_HII_FORMSET_TEMPLATE;\r
 #pragma pack()\r
 \r


@@ -47,8 +47,8 @@ FW_HII_FORMSET_TEMPLATE FormSetTemplate = {
   },\r
   {\r
     {\r
   },\r
   {\r
     {\r

-      FRAMEWORK_EFI_IFR_END_FORM_SET_OP,\r
-      sizeof (FRAMEWORK_EFI_IFR_END_FORM_SET)\r
+      EFI_IFR_END_FORM_SET_OP,\r
+      sizeof (EFI_IFR_END_FORM_SET)\r

     }\r
   }\r
 };\r
     }\r
   }\r
 };\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
index 9b07b29c83c282a86ce6d6b60b12b8329bb49d26..ced2ad326f961c86b4a2aac1b23202be1e284d91 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
@@ -407,7 +407,7 @@ ThunkSendForm (
   IN  BOOLEAN                         UseDatabase,\r
   IN  FRAMEWORK_EFI_HII_HANDLE        *Handle,\r
   IN  UINTN                           HandleCount,\r
   IN  BOOLEAN                         UseDatabase,\r
   IN  FRAMEWORK_EFI_HII_HANDLE        *Handle,\r
   IN  UINTN                           HandleCount,\r

-  IN  FRAMEWORK_EFI_IFR_PACKET        *Packet, OPTIONAL\r
+  IN  EFI_IFR_PACKET                  *Packet, OPTIONAL\r

   IN  EFI_HANDLE                      CallbackHandle, OPTIONAL\r
   IN  UINT8                           *NvMapOverride, OPTIONAL\r
   IN  FRAMEWORK_EFI_SCREEN_DESCRIPTOR *ScreenDimensions, OPTIONAL\r
   IN  EFI_HANDLE                      CallbackHandle, OPTIONAL\r
   IN  UINT8                           *NvMapOverride, OPTIONAL\r
   IN  FRAMEWORK_EFI_SCREEN_DESCRIPTOR *ScreenDimensions, OPTIONAL\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/OpcodeCreation.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/OpcodeCreation.c
index 3ac72115794692765bbbf9be4c58a2a1ec481b6e..7a14b9c68ae9dbbcd0192e39863c61371f1efafe 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/OpcodeCreation.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/OpcodeCreation.c
@@ -58,7 +58,7 @@ QuestionOpFwToUefi (
     }\r
   }\r
 \r
     }\r
   }\r
 \r

-  *UefiOp = (UINT8) (FRAMEWORK_EFI_IFR_LAST_OPCODE + 1);\r
+  *UefiOp = (UINT8) (EFI_IFR_LAST_OPCODE + 1);\r

   return EFI_NOT_FOUND;\r
 }\r
 \r
   return EFI_NOT_FOUND;\r
 }\r
 \r


@@ -184,7 +184,7 @@ F2UCreateTextOpCode (
 {\r
   EFI_IFR_TEXT      UTextOpCode;\r
 \r
 {\r
   EFI_IFR_TEXT      UTextOpCode;\r
 \r

-  if ((FwOpcode->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) == 0) {\r
+  if ((FwOpcode->Flags & EFI_IFR_FLAG_INTERACTIVE) == 0) {\r

     ZeroMem (&UTextOpCode, sizeof(UTextOpCode));\r
     \r
     UTextOpCode.Header.OpCode = EFI_IFR_TEXT_OP;\r
     ZeroMem (&UTextOpCode, sizeof(UTextOpCode));\r
     \r
     UTextOpCode.Header.OpCode = EFI_IFR_TEXT_OP;\r


@@ -234,10 +234,10 @@ F2UCreateReferenceOpCode (
   UOpcode.FormId = FwOpcode->FormId;\r
 \r
   //\r
   UOpcode.FormId = FwOpcode->FormId;\r
 \r
   //\r

-  // We only map FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE and FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED to \r
+  // We only map EFI_IFR_FLAG_INTERACTIVE and EFI_IFR_FLAG_RESET_REQUIRED to \r

   // UEFI IFR Opcode flags. The rest flags are obsolete.\r
   //\r
   // UEFI IFR Opcode flags. The rest flags are obsolete.\r
   //\r

-  UOpcode.Question.Flags  = (UINT8) (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED));\r
+  UOpcode.Question.Flags  = (UINT8) (FwOpcode->Flags & (EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_RESET_REQUIRED));\r

   \r
   return HiiCreateRawOpCodes (UefiUpdateDataHandle, (UINT8 *) &UOpcode, sizeof(UOpcode));\r
 }\r
   \r
   return HiiCreateRawOpCodes (UefiUpdateDataHandle, (UINT8 *) &UOpcode, sizeof(UOpcode));\r
 }\r


@@ -271,12 +271,12 @@ F2UCreateOneOfOptionOpCode (
   CopyMem (&UOpcode.Value.u8, &FwOpcode->Value, Width);\r
 \r
   //\r
   CopyMem (&UOpcode.Value.u8, &FwOpcode->Value, Width);\r
 \r
   //\r

-  // #define FRAMEWORK_EFI_IFR_FLAG_DEFAULT           0x01\r
-  // #define FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING     0x02\r
+  // #define EFI_IFR_FLAG_DEFAULT           0x01\r
+  // #define EFI_IFR_FLAG_MANUFACTURING     0x02\r

   // #define EFI_IFR_OPTION_DEFAULT                   0x10\r
   // #define EFI_IFR_OPTION_DEFAULT_MFG               0x20\r
   //\r
   // #define EFI_IFR_OPTION_DEFAULT                   0x10\r
   // #define EFI_IFR_OPTION_DEFAULT_MFG               0x20\r
   //\r

-  UOpcode.Flags = (UINT8) (UOpcode.Flags  | (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_DEFAULT | FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING)) << 4);\r
+  UOpcode.Flags = (UINT8) (UOpcode.Flags  | (FwOpcode->Flags & (EFI_IFR_FLAG_DEFAULT | EFI_IFR_FLAG_MANUFACTURING)) << 4);\r

 \r
   switch (Width) {\r
     case 1:\r
 \r
   switch (Width) {\r
     case 1:\r


@@ -339,7 +339,7 @@ CreateGuidOptionKeyOpCode (
   @param ThunkContext             The HII Thunk Context.\r
   @param FwOpcode                 The input Framework Opcode.\r
   @param UefiUpdateDataHandle     The newly created UEFI HII opcode is appended to UefiUpdateDataHandle.\r
   @param ThunkContext             The HII Thunk Context.\r
   @param FwOpcode                 The input Framework Opcode.\r
   @param UefiUpdateDataHandle     The newly created UEFI HII opcode is appended to UefiUpdateDataHandle.\r

-  @param NextFwOpcode             Returns the position of the next Framework Opcode after FRAMEWORK_EFI_IFR_END_ONE_OF_OP of\r
+  @param NextFwOpcode             Returns the position of the next Framework Opcode after EFI_IFR_END_ONE_OF_OP of\r

                                   the "One Of Option".\r
   @param OpcodeCount              The number of Opcode for the complete Framework "One Of" Opcode.\r
                       \r
                                   the "One Of Option".\r
   @param OpcodeCount              The number of Opcode for the complete Framework "One Of" Opcode.\r
                       \r


@@ -382,11 +382,11 @@ F2UCreateOneOfOpCode (
   // Go over the Framework IFR binary to get the QuestionId for generated UEFI One Of Option opcode\r
   //\r
   FwOpHeader = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((UINT8 *) FwOpcode + FwOpcode->Header.Length);\r
   // Go over the Framework IFR binary to get the QuestionId for generated UEFI One Of Option opcode\r
   //\r
   FwOpHeader = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((UINT8 *) FwOpcode + FwOpcode->Header.Length);\r

-  while (FwOpHeader->OpCode != FRAMEWORK_EFI_IFR_END_ONE_OF_OP) {\r
+  while (FwOpHeader->OpCode != EFI_IFR_END_ONE_OF_OP) {\r

     ASSERT (FwOpHeader->OpCode == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP);\r
     \r
     FwOneOfOp = (FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FwOpHeader;\r
     ASSERT (FwOpHeader->OpCode == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP);\r
     \r
     FwOneOfOp = (FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FwOpHeader;\r

-    if ((FwOneOfOp->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) != 0) {\r
+    if ((FwOneOfOp->Flags & EFI_IFR_FLAG_INTERACTIVE) != 0) {\r

       UOpcode.Question.Flags |= EFI_IFR_FLAG_CALLBACK;\r
       \r
       if (UOpcode.Question.QuestionId == 0) {\r
       UOpcode.Question.Flags |= EFI_IFR_FLAG_CALLBACK;\r
       \r
       if (UOpcode.Question.QuestionId == 0) {\r


@@ -398,7 +398,7 @@ F2UCreateOneOfOpCode (
 \r
     }\r
 \r
 \r
     }\r
 \r

-    if (FwOneOfOp->Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED) {\r
+    if (FwOneOfOp->Flags & EFI_IFR_FLAG_RESET_REQUIRED) {\r

       UOpcode.Question.Flags |= EFI_IFR_FLAG_RESET_REQUIRED;\r
     }\r
 \r
       UOpcode.Question.Flags |= EFI_IFR_FLAG_RESET_REQUIRED;\r
     }\r
 \r


@@ -426,7 +426,7 @@ F2UCreateOneOfOpCode (
   // Go over again the Framework IFR binary to build the UEFI One Of Option opcodes.\r
   //\r
   FwOpHeader = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((UINT8 *) FwOpcode + FwOpcode->Header.Length);\r
   // Go over again the Framework IFR binary to build the UEFI One Of Option opcodes.\r
   //\r
   FwOpHeader = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((UINT8 *) FwOpcode + FwOpcode->Header.Length);\r

-  while (FwOpHeader->OpCode != FRAMEWORK_EFI_IFR_END_ONE_OF_OP) {\r
+  while (FwOpHeader->OpCode != EFI_IFR_END_ONE_OF_OP) {\r

 \r
     FwOneOfOp = (FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FwOpHeader;\r
       \r
 \r
     FwOneOfOp = (FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FwOpHeader;\r
       \r


@@ -459,7 +459,7 @@ F2UCreateOneOfOpCode (
   @param ThunkContext         The HII Thunk Context.\r
   @param FwOpcode             The input Framework Opcode.\r
   @param UefiUpdateDataHandle The newly created UEFI HII opcode is appended to UefiUpdateDataHandle.\r
   @param ThunkContext         The HII Thunk Context.\r
   @param FwOpcode             The input Framework Opcode.\r
   @param UefiUpdateDataHandle The newly created UEFI HII opcode is appended to UefiUpdateDataHandle.\r

-  @param NextFwOpcode         Returns the position of the next Framework Opcode after FRAMEWORK_EFI_IFR_END_ONE_OF_OP of\r
+  @param NextFwOpcode         Returns the position of the next Framework Opcode after EFI_IFR_END_ONE_OF_OP of\r

                               the "Ordered List".\r
   @param OpcodeCount          The number of Opcode for the complete Framework "Ordered List" Opcode.\r
                       \r
                               the "Ordered List".\r
   @param OpcodeCount          The number of Opcode for the complete Framework "Ordered List" Opcode.\r
                       \r


@@ -501,11 +501,11 @@ F2UCreateOrderedListOpCode (
   // Go over the Framework IFR binary to get the QuestionId for generated UEFI One Of Option opcode\r
   //\r
   FwOpHeader = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((UINT8 *) FwOpcode + FwOpcode->Header.Length);\r
   // Go over the Framework IFR binary to get the QuestionId for generated UEFI One Of Option opcode\r
   //\r
   FwOpHeader = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((UINT8 *) FwOpcode + FwOpcode->Header.Length);\r

-  while (FwOpHeader->OpCode != FRAMEWORK_EFI_IFR_END_ONE_OF_OP) {\r
+  while (FwOpHeader->OpCode != EFI_IFR_END_ONE_OF_OP) {\r

     ASSERT (FwOpHeader->OpCode == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP);\r
     \r
     FwOneOfOp = (FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FwOpHeader;\r
     ASSERT (FwOpHeader->OpCode == FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP);\r
     \r
     FwOneOfOp = (FRAMEWORK_EFI_IFR_ONE_OF_OPTION *) FwOpHeader;\r

-    if ((FwOneOfOp->Flags & FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE) != 0) {\r
+    if ((FwOneOfOp->Flags & EFI_IFR_FLAG_INTERACTIVE) != 0) {\r

       UOpcode.Question.Flags |= EFI_IFR_FLAG_CALLBACK;\r
       \r
       if (UOpcode.Question.QuestionId == 0) {\r
       UOpcode.Question.Flags |= EFI_IFR_FLAG_CALLBACK;\r
       \r
       if (UOpcode.Question.QuestionId == 0) {\r


@@ -517,7 +517,7 @@ F2UCreateOrderedListOpCode (
       }\r
     }\r
 \r
       }\r
     }\r
 \r

-    if (FwOneOfOp->Flags & FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED) {\r
+    if (FwOneOfOp->Flags & EFI_IFR_FLAG_RESET_REQUIRED) {\r

       UOpcode.Question.Flags |= EFI_IFR_FLAG_RESET_REQUIRED;\r
     }\r
 \r
       UOpcode.Question.Flags |= EFI_IFR_FLAG_RESET_REQUIRED;\r
     }\r
 \r


@@ -538,7 +538,7 @@ F2UCreateOrderedListOpCode (
   *OpcodeCount += 1;\r
 \r
   FwOpHeader = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((UINT8 *) FwOpcode + FwOpcode->Header.Length);\r
   *OpcodeCount += 1;\r
 \r
   FwOpHeader = (FRAMEWORK_EFI_IFR_OP_HEADER *) ((UINT8 *) FwOpcode + FwOpcode->Header.Length);\r

-  while (FwOpHeader->OpCode != FRAMEWORK_EFI_IFR_END_ONE_OF_OP) {\r
+  while (FwOpHeader->OpCode != EFI_IFR_END_ONE_OF_OP) {\r

     //\r
     // Each entry of Order List in Framework HII is always 1 byte in size\r
     //\r
     //\r
     // Each entry of Order List in Framework HII is always 1 byte in size\r
     //\r


@@ -602,11 +602,11 @@ F2UCreateCheckBoxOpCode (
 \r
   //\r
   // We map 2 flags:\r
 \r
   //\r
   // We map 2 flags:\r

-  //      FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE, \r
-  //      FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED,\r
+  //      EFI_IFR_FLAG_INTERACTIVE, \r
+  //      EFI_IFR_FLAG_RESET_REQUIRED,\r

   // to UEFI IFR Opcode Question flags. The rest flags are obsolete.\r
   //\r
   // to UEFI IFR Opcode Question flags. The rest flags are obsolete.\r
   //\r

-  UOpcode.Question.Flags  = (UINT8) (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED));\r
+  UOpcode.Question.Flags  = (UINT8) (FwOpcode->Flags & (EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_RESET_REQUIRED));\r

 \r
 \r
   UOpcode.Question.VarStoreId    = ThunkContext->FormSet->DefaultVarStoreId;\r
 \r
 \r
   UOpcode.Question.VarStoreId    = ThunkContext->FormSet->DefaultVarStoreId;\r


@@ -614,11 +614,11 @@ F2UCreateCheckBoxOpCode (
 \r
   //\r
   // We also map these 2 flags:\r
 \r
   //\r
   // We also map these 2 flags:\r

-  //      FRAMEWORK_EFI_IFR_FLAG_DEFAULT, \r
-  //      FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING,\r
+  //      EFI_IFR_FLAG_DEFAULT, \r
+  //      EFI_IFR_FLAG_MANUFACTURING,\r

   // to UEFI IFR CheckBox Opcode default flags.\r
   //\r
   // to UEFI IFR CheckBox Opcode default flags.\r
   //\r

-  UOpcode.Flags           = (UINT8) (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_DEFAULT | FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING));\r
+  UOpcode.Flags           = (UINT8) (FwOpcode->Flags & (EFI_IFR_FLAG_DEFAULT | EFI_IFR_FLAG_MANUFACTURING));\r

 \r
   return HiiCreateRawOpCodes (UefiUpdateDataHandle, (UINT8 *) &UOpcode, sizeof(UOpcode));\r
 }\r
 \r
   return HiiCreateRawOpCodes (UefiUpdateDataHandle, (UINT8 *) &UOpcode, sizeof(UOpcode));\r
 }\r


@@ -676,7 +676,7 @@ F2UCreateNumericOpCode (
   UOpcode.Question.VarStoreId    = ThunkContext->FormSet->DefaultVarStoreId;\r
   UOpcode.Question.VarStoreInfo.VarOffset = FwOpcode->QuestionId;\r
 \r
   UOpcode.Question.VarStoreId    = ThunkContext->FormSet->DefaultVarStoreId;\r
   UOpcode.Question.VarStoreInfo.VarOffset = FwOpcode->QuestionId;\r
 \r

-  UOpcode.Question.Flags  = (UINT8) (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED));\r
+  UOpcode.Question.Flags  = (UINT8) (FwOpcode->Flags & (EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_RESET_REQUIRED));\r

 \r
   //\r
   // Framework Numeric values are all in UINT16 and displayed as decimal.\r
 \r
   //\r
   // Framework Numeric values are all in UINT16 and displayed as decimal.\r


@@ -787,7 +787,7 @@ F2UCreateStringOpCode (
   UOpcode.Question.Header.Prompt = FwOpcode->Prompt;\r
   UOpcode.Question.Header.Help = FwOpcode->Help;\r
 \r
   UOpcode.Question.Header.Prompt = FwOpcode->Prompt;\r
   UOpcode.Question.Header.Help = FwOpcode->Help;\r
 \r

-  UOpcode.Question.Flags  = (UINT8) (FwOpcode->Flags & (FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE | FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED));\r
+  UOpcode.Question.Flags  = (UINT8) (FwOpcode->Flags & (EFI_IFR_FLAG_INTERACTIVE | EFI_IFR_FLAG_RESET_REQUIRED));\r

 \r
   UOpcode.Question.VarStoreId    = ThunkContext->FormSet->DefaultVarStoreId;\r
   UOpcode.Question.VarStoreInfo.VarOffset = FwOpcode->QuestionId;\r
 \r
   UOpcode.Question.VarStoreId    = ThunkContext->FormSet->DefaultVarStoreId;\r
   UOpcode.Question.VarStoreInfo.VarOffset = FwOpcode->QuestionId;\r


@@ -811,8 +811,8 @@ F2UCreateStringOpCode (
 **/\r
 UINT8 *\r
 F2UCreateBannerOpCode (\r
 **/\r
 UINT8 *\r
 F2UCreateBannerOpCode (\r

-  IN OUT   VOID                        *UefiUpdateDataHandle,\r
-  IN CONST FRAMEWORK_EFI_IFR_BANNER    *FwOpcode\r
+  IN OUT   VOID              *UefiUpdateDataHandle,\r
+  IN CONST EFI_IFR_BANNER    *FwOpcode\r

   )\r
 {\r
   EFI_IFR_GUID_BANNER *UOpcode;\r
   )\r
 {\r
   EFI_IFR_GUID_BANNER *UOpcode;\r


@@ -907,12 +907,12 @@ FwUpdateDataToUefiUpdateData (
         DataCount = 1;\r
         break;\r
 \r
         DataCount = 1;\r
         break;\r
 \r

-      case FRAMEWORK_EFI_IFR_BANNER_OP:\r
-        OpCodeBuffer = F2UCreateBannerOpCode (UefiOpCodeHandle, (FRAMEWORK_EFI_IFR_BANNER *) FwOpCode);  \r
+      case EFI_IFR_BANNER_OP:\r
+        OpCodeBuffer = F2UCreateBannerOpCode (UefiOpCodeHandle, (EFI_IFR_BANNER *) FwOpCode);  \r

         DataCount = 1;\r
         break;\r
 \r
         DataCount = 1;\r
         break;\r
 \r

-      case FRAMEWORK_EFI_IFR_END_ONE_OF_OP:\r
+      case EFI_IFR_END_ONE_OF_OP:\r

         OpCodeBuffer = HiiCreateEndOpCode (UefiOpCodeHandle);\r
         DataCount = 1;\r
         break;\r
         OpCodeBuffer = HiiCreateEndOpCode (UefiOpCodeHandle);\r
         DataCount = 1;\r
         break;\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.c
index 43d1b9c0f40f67f3c417fe4ec7b4c469a06e18dd..b16d25797b65f2907d9f13ef3da7ffa40ee5eaa2 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/SetupBrowser.c
@@ -412,7 +412,7 @@ ThunkSendForm (
   IN  BOOLEAN                           UseDatabase,\r
   IN  FRAMEWORK_EFI_HII_HANDLE          *Handle,\r
   IN  UINTN                             HandleCount,\r
   IN  BOOLEAN                           UseDatabase,\r
   IN  FRAMEWORK_EFI_HII_HANDLE          *Handle,\r
   IN  UINTN                             HandleCount,\r

-  IN  FRAMEWORK_EFI_IFR_PACKET          *Packet, OPTIONAL\r
+  IN  EFI_IFR_PACKET                    *Packet, OPTIONAL\r

   IN  EFI_HANDLE                        CallbackHandle, OPTIONAL\r
   IN  UINT8                             *NvMapOverride, OPTIONAL\r
   IN  FRAMEWORK_EFI_SCREEN_DESCRIPTOR   *ScreenDimensions, OPTIONAL\r
   IN  EFI_HANDLE                        CallbackHandle, OPTIONAL\r
   IN  UINT8                             *NvMapOverride, OPTIONAL\r
   IN  FRAMEWORK_EFI_SCREEN_DESCRIPTOR   *ScreenDimensions, OPTIONAL\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/UefiIfrDefault.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/UefiIfrDefault.c
index e1924791afe0d6a6e5a5c35e1be5ab7e5b5fc2fa..9dc7d2eb6d3f9b2624f8bc51f0cbbd9969334b3c 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/UefiIfrDefault.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/UefiIfrDefault.c
@@ -388,16 +388,16 @@ UefiIfrGetBufferTypeDefaults (
                                               which contains the default values retrived from\r
                                               a UEFI form set.\r
   @param  DefaultMask            The default mask.\r
                                               which contains the default values retrived from\r
                                               a UEFI form set.\r
   @param  DefaultMask            The default mask.\r

-                                             The valid values are FRAMEWORK_EFI_IFR_FLAG_DEFAULT\r
-                                             and FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING.\r
-                                            UEFI spec only map FRAMEWORK_EFI_IFR_FLAG_DEFAULT and FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING \r
+                                             The valid values are EFI_IFR_FLAG_DEFAULT\r
+                                             and EFI_IFR_FLAG_MANUFACTURING.\r
+                                            UEFI spec only map EFI_IFR_FLAG_DEFAULT and EFI_IFR_FLAG_MANUFACTURING \r

                                             from specification to valid default class.\r
   @param  VariablePackList     The output default value in a format defined in Framework.\r
                                              \r
 \r
   @retval   EFI_SUCCESS                       Successful.\r
                                             from specification to valid default class.\r
   @param  VariablePackList     The output default value in a format defined in Framework.\r
                                              \r
 \r
   @retval   EFI_SUCCESS                       Successful.\r

-  @retval   EFI_INVALID_PARAMETER      The default mask is not FRAMEWORK_EFI_IFR_FLAG_DEFAULT or \r
-                                                           FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING.\r
+  @retval   EFI_INVALID_PARAMETER      The default mask is not EFI_IFR_FLAG_DEFAULT or \r
+                                                           EFI_IFR_FLAG_MANUFACTURING.\r

 **/\r
 EFI_STATUS\r
 UefiDefaultsToFwDefaults (\r
 **/\r
 EFI_STATUS\r
 UefiDefaultsToFwDefaults (\r


@@ -416,13 +416,13 @@ UefiDefaultsToFwDefaults (
   EFI_HII_VARIABLE_PACK_LIST        *PackList;\r
   UINTN                             Index;\r
 \r
   EFI_HII_VARIABLE_PACK_LIST        *PackList;\r
   UINTN                             Index;\r
 \r

-  if (DefaultMask == FRAMEWORK_EFI_IFR_FLAG_DEFAULT) {\r
+  if (DefaultMask == EFI_IFR_FLAG_DEFAULT) {\r

     DefaultId = EFI_HII_DEFAULT_CLASS_STANDARD;\r
     DefaultId = EFI_HII_DEFAULT_CLASS_STANDARD;\r

-  } else if (DefaultMask == FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING) {\r
+  } else if (DefaultMask == EFI_IFR_FLAG_MANUFACTURING) {\r

     DefaultId = EFI_HII_DEFAULT_CLASS_MANUFACTURING;\r
   } else {\r
     //\r
     DefaultId = EFI_HII_DEFAULT_CLASS_MANUFACTURING;\r
   } else {\r
     //\r

-    // UEFI spec only map FRAMEWORK_EFI_IFR_FLAG_DEFAULT and FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING \r
+    // UEFI spec only map EFI_IFR_FLAG_DEFAULT and EFI_IFR_FLAG_MANUFACTURING \r

     // from specification to valid default class.\r
     //\r
     ASSERT (FALSE);\r
     // from specification to valid default class.\r
     //\r
     ASSERT (FALSE);\r