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

1 files changed, 18 insertions, 18 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;

           }