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@8923 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 24 insertions, 22 deletions

diff --git a/IntelFrameworkPkg/Include/Protocol/FrameworkFormBrowser.h b/IntelFrameworkPkg/Include/Protocol/FrameworkFormBrowser.h
index bacea04765..9fca00f28f 100644
--- a/IntelFrameworkPkg/Include/Protocol/FrameworkFormBrowser.h
+++ b/IntelFrameworkPkg/Include/Protocol/FrameworkFormBrowser.h
@@ -14,6 +14,8 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

+  Module Name:  FrameworkFormBrowser.h

+

   @par Revision Reference:

   This protocol is defined in HII spec 0.92.

 

@@ -46,7 +48,7 @@ typedef struct {
 typedef struct {

   EFI_HII_IFR_PACK    *IfrData;

   EFI_HII_STRING_PACK *StringData;

-} FRAMEWORK_EFI_IFR_PACKET;

+} EFI_IFR_PACKET;

 

 typedef struct {

   UINTN LeftColumn;

@@ -99,7 +101,7 @@ EFI_STATUS
   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/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h b/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h
index 875f27c927..e26c02aa5b 100644
--- a/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h
+++ b/IntelFrameworkPkg/Include/Protocol/FrameworkFormCallback.h
@@ -19,8 +19,8 @@
 

 **/

 

-#ifndef __FORM_CALLBACK_H__

-#define __FORM_CALLBACK_H__

+#ifndef __FRAMEWORK_FORM_CALLBACK_H__

+#define __FRAMEWORK_FORM_CALLBACK_H__

 

 #include <Protocol/FrameworkHii.h>

 #include <Protocol/FrameworkFormBrowser.h>

@@ -66,32 +66,32 @@ typedef struct _EFI_FORM_CALLBACK_PROTOCOL  EFI_FORM_CALLBACK_PROTOCOL;
 #pragma pack(1)

 typedef struct {

   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

   /// If the OpCode is a String type - Data is a CHAR16[x] type

   /// If the OpCode is a Checkbox type - Data is a UINT8 value

-  /// If the OpCode is a NV Access type - Data is a FRAMEWORK_EFI_IFR_NV_DATA structure

+  /// If the OpCode is a NV Access type - Data is a EFI_IFR_NV_DATA structure

   ///

-} FRAMEWORK_EFI_IFR_DATA_ENTRY;

+} EFI_IFR_DATA_ENTRY;

 

 typedef struct {

   VOID                *NvRamMap;  ///< If the flag of the op-code specified retrieval of a copy of the NVRAM map,

   //

   // this is a pointer to a buffer copy

   //

-  UINT32              EntryCount; ///< How many FRAMEWORK_EFI_IFR_DATA_ENTRY entries

+  UINT32              EntryCount; ///< How many EFI_IFR_DATA_ENTRY entries

   //

-  // FRAMEWORK_EFI_IFR_DATA_ENTRY  Data[1];    // The in-line Data entries.

+  // EFI_IFR_DATA_ENTRY  Data[1];    // The in-line Data entries.

   //

-} FRAMEWORK_EFI_IFR_DATA_ARRAY;

+} EFI_IFR_DATA_ARRAY;

 

 

 typedef union {

-  FRAMEWORK_EFI_IFR_DATA_ARRAY  DataArray;  ///< Primarily used by those who call back to their drivers and use HII as a repository

-  FRAMEWORK_EFI_IFR_PACKET      DataPacket; ///< Primarily used by those which do not use HII as a repository

+  EFI_IFR_DATA_ARRAY  DataArray;  ///< Primarily used by those who call back to their drivers and use HII as a repository

+  EFI_IFR_PACKET      DataPacket; ///< Primarily used by those which do not use HII as a repository

   CHAR16                        String[1];  ///< If returning an error - fill the string with null-terminated contents

 } EFI_HII_CALLBACK_PACKET;

 

@@ -102,7 +102,7 @@ typedef struct {
   //

   // CHAR8             Data[1];      // The Data itself

   //

-} FRAMEWORK_EFI_IFR_NV_DATA;

+} EFI_IFR_NV_DATA;

 

 #pragma pack()

 //

@@ -199,7 +199,7 @@ EFI_STATUS
 (EFIAPI *EFI_FORM_CALLBACK)(

   IN     EFI_FORM_CALLBACK_PROTOCOL    *This,

   IN     UINT16                        KeyValue,

-  IN     FRAMEWORK_EFI_IFR_DATA_ARRAY  *Data,

+  IN     EFI_IFR_DATA_ARRAY  *Data,

   OUT    EFI_HII_CALLBACK_PACKET       **Packet

   );

 

diff --git a/IntelFrameworkPkg/Include/Protocol/FrameworkMpService.h b/IntelFrameworkPkg/Include/Protocol/FrameworkMpService.h
index e11bb7047a..3947847f12 100644
--- a/IntelFrameworkPkg/Include/Protocol/FrameworkMpService.h
+++ b/IntelFrameworkPkg/Include/Protocol/FrameworkMpService.h
@@ -191,7 +191,7 @@ typedef struct {
   ///

   /// @par IPF:

   ///   Bit format of this field is the same as the definition of self-test state 

-  ///   parameter, in Intel® Itanium® Architecture Software Developer’s Manual, 

+  ///   parameter, in Intel?Itanium?Architecture Software Developer’s Manual, 

   ///   Volume 2: System Architecture.

   ///

   EFI_MP_HEALTH        Health;

@@ -259,7 +259,7 @@ typedef struct {
 **/

 typedef

 EFI_STATUS

-(EFIAPI *FRAMEWORK_EFI_MP_SERVICES_GET_GENERAL_MP_INFO)(

+(EFIAPI *EFI_MP_SERVICES_GET_GENERAL_MP_INFO)(

   IN  FRAMEWORK_EFI_MP_SERVICES_PROTOCOL  *This,

   OUT UINTN                               *NumberOfCPUs          OPTIONAL,

   OUT UINTN                               *MaximumNumberOfCPUs   OPTIONAL,

@@ -312,7 +312,7 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI *FRAMEWORK_EFI_MP_SERVICES_GET_PROCESSOR_CONTEXT)(

+(EFIAPI *EFI_MP_SERVICES_GET_PROCESSOR_CONTEXT)(

   IN     FRAMEWORK_EFI_MP_SERVICES_PROTOCOL  *This,

   IN     UINTN                               ProcessorNumber,

   IN OUT UINTN                               *BufferLength,

@@ -377,7 +377,7 @@ EFI_STATUS
                                       If the value is not zero, the BSP waits 

                                       until all APs finish or timeout expires. 

                                       If timeout expires, EFI_TIMEOUT is returned,

-                                      and the BSP will then check APs’ status 

+                                      and the BSP will then check APs?status 

                                       periodically, with time interval of 16 

                                       microseconds.

                                       - IPF:

@@ -575,7 +575,7 @@ EFI_STATUS
 **/

 typedef

 EFI_STATUS

-(EFIAPI *FRAMEWORK_EFI_MP_SERVICES_SEND_IPI)(

+(EFIAPI *EFI_MP_SERVICES_SEND_IPI)(

   IN FRAMEWORK_EFI_MP_SERVICES_PROTOCOL  *This,

   IN UINTN                               ProcessorNumber,

   IN UINTN                               VectorNumber,

@@ -645,12 +645,12 @@ EFI_STATUS
 /// Framework MP Services Protocol structure

 ///

 typedef struct _FRAMEWORK_EFI_MP_SERVICES_PROTOCOL {

-  FRAMEWORK_EFI_MP_SERVICES_GET_GENERAL_MP_INFO    GetGeneralMPInfo;

-  FRAMEWORK_EFI_MP_SERVICES_GET_PROCESSOR_CONTEXT  GetProcessorContext;

+  EFI_MP_SERVICES_GET_GENERAL_MP_INFO              GetGeneralMPInfo;

+  EFI_MP_SERVICES_GET_PROCESSOR_CONTEXT            GetProcessorContext;

   FRAMEWORK_EFI_MP_SERVICES_STARTUP_ALL_APS        StartupAllAPs;

   FRAMEWORK_EFI_MP_SERVICES_STARTUP_THIS_AP        StartupThisAP;

   FRAMEWORK_EFI_MP_SERVICES_SWITCH_BSP             SwitchBSP;

-  FRAMEWORK_EFI_MP_SERVICES_SEND_IPI               SendIPI;

+  EFI_MP_SERVICES_SEND_IPI                         SendIPI;

   FRAMEWORK_EFI_MP_SERVICES_ENABLEDISABLEAP        EnableDisableAP;

   FRAMEWORK_EFI_MP_SERVICES_WHOAMI                 WhoAmI;

 };