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

10 files changed, 84 insertions, 81 deletions

diff --git a/IntelFrameworkPkg/Include/Framework/BootScript.h b/IntelFrameworkPkg/Include/Framework/BootScript.h
index 939c1f5078..c780809604 100644
--- a/IntelFrameworkPkg/Include/Framework/BootScript.h
+++ b/IntelFrameworkPkg/Include/Framework/BootScript.h
@@ -13,8 +13,8 @@
 

 **/

 

-#ifndef _FRAMEWORK_BOOT_SCRIPT_H_

-#define _FRAMEWORK_BOOT_SCRIPT_H_

+#ifndef _BOOT_SCRIPT_H_

+#define _BOOT_SCRIPT_H_

 

 ///

 /// S3 Boot Script Table identifier

diff --git a/IntelFrameworkPkg/Include/Framework/DxeCis.h b/IntelFrameworkPkg/Include/Framework/DxeCis.h
index 86d96ddd41..83e2055ac6 100644
--- a/IntelFrameworkPkg/Include/Framework/DxeCis.h
+++ b/IntelFrameworkPkg/Include/Framework/DxeCis.h
@@ -13,8 +13,8 @@
 

 **/

 

-#ifndef _DXE_CIS_H_

-#define _DXE_CIS_H_

+#ifndef _DXECIS_H_

+#define _DXECIS_H_

 

 #include <Protocol/StatusCode.h>

 

diff --git a/IntelFrameworkPkg/Include/Framework/FirmwareVolumeImageFormat.h b/IntelFrameworkPkg/Include/Framework/FirmwareVolumeImageFormat.h
index 0d88917592..0185887bda 100644
--- a/IntelFrameworkPkg/Include/Framework/FirmwareVolumeImageFormat.h
+++ b/IntelFrameworkPkg/Include/Framework/FirmwareVolumeImageFormat.h
@@ -17,8 +17,8 @@
 

 **/

 

-#ifndef __FRAMEWORK_FIRMWARE_VOLUME_IMAGE_FORMAT_H__

-#define __FRAMEWORK_FIRMWARE_VOLUME_IMAGE_FORMAT_H__

+#ifndef __FIRMWARE_VOLUME_IMAGE_FORMAT_H__

+#define __FIRMWARE_VOLUME_IMAGE_FORMAT_H__

 

 //

 // Bit values for AuthenticationStatus

diff --git a/IntelFrameworkPkg/Include/Framework/FrameworkInternalFormRepresentation.h b/IntelFrameworkPkg/Include/Framework/FrameworkInternalFormRepresentation.h
index f261fa347e..7b76d981f3 100644
--- a/IntelFrameworkPkg/Include/Framework/FrameworkInternalFormRepresentation.h
+++ b/IntelFrameworkPkg/Include/Framework/FrameworkInternalFormRepresentation.h
@@ -28,20 +28,20 @@ typedef UINT16  STRING_REF;
 #define FRAMEWORK_EFI_IFR_FORM_OP                 0x01

 #define FRAMEWORK_EFI_IFR_SUBTITLE_OP             0x02

 #define FRAMEWORK_EFI_IFR_TEXT_OP                 0x03

-#define FRAMEWORK_EFI_IFR_GRAPHIC_OP              0x04

+#define EFI_IFR_GRAPHIC_OP              0x04

 #define FRAMEWORK_EFI_IFR_ONE_OF_OP               0x05

 #define FRAMEWORK_EFI_IFR_CHECKBOX_OP             0x06

 #define FRAMEWORK_EFI_IFR_NUMERIC_OP              0x07

 #define FRAMEWORK_EFI_IFR_PASSWORD_OP             0x08

 #define FRAMEWORK_EFI_IFR_ONE_OF_OPTION_OP        0x09  ///< ONEOF OPTION field

 #define FRAMEWORK_EFI_IFR_SUPPRESS_IF_OP          0x0A

-#define FRAMEWORK_EFI_IFR_END_FORM_OP             0x0B

-#define FRAMEWORK_EFI_IFR_HIDDEN_OP               0x0C

-#define FRAMEWORK_EFI_IFR_END_FORM_SET_OP         0x0D

+#define EFI_IFR_END_FORM_OP             0x0B

+#define EFI_IFR_HIDDEN_OP               0x0C

+#define EFI_IFR_END_FORM_SET_OP         0x0D

 #define FRAMEWORK_EFI_IFR_FORM_SET_OP             0x0E

 #define FRAMEWORK_EFI_IFR_REF_OP                  0x0F

-#define FRAMEWORK_EFI_IFR_END_ONE_OF_OP           0x10

-#define FRAMEWORK_EFI_IFR_END_OP                  FRAMEWORK_EFI_IFR_END_ONE_OF_OP

+#define EFI_IFR_END_ONE_OF_OP           0x10

+#define FRAMEWORK_EFI_IFR_END_OP                  EFI_IFR_END_ONE_OF_OP

 #define FRAMEWORK_EFI_IFR_INCONSISTENT_IF_OP      0x11

 #define FRAMEWORK_EFI_IFR_EQ_ID_VAL_OP            0x12

 #define FRAMEWORK_EFI_IFR_EQ_ID_ID_OP             0x13

@@ -49,35 +49,35 @@ typedef UINT16  STRING_REF;
 #define FRAMEWORK_EFI_IFR_AND_OP                  0x15

 #define FRAMEWORK_EFI_IFR_OR_OP                   0x16

 #define FRAMEWORK_EFI_IFR_NOT_OP                  0x17

-#define FRAMEWORK_EFI_IFR_END_IF_OP               0x18  ///< for endif of inconsistentif, suppressif, grayoutif

-#define FRAMEWORK_EFI_IFR_GRAYOUT_IF_OP           0x19

+#define EFI_IFR_END_IF_OP               0x18  ///< for endif of inconsistentif, suppressif, grayoutif

+#define EFI_IFR_GRAYOUT_IF_OP           0x19

 #define FRAMEWORK_EFI_IFR_DATE_OP                 0x1A

 #define FRAMEWORK_EFI_IFR_TIME_OP                 0x1B

 #define FRAMEWORK_EFI_IFR_STRING_OP               0x1C

-#define FRAMEWORK_EFI_IFR_LABEL_OP                0x1D

-#define FRAMEWORK_EFI_IFR_SAVE_DEFAULTS_OP        0x1E

-#define FRAMEWORK_EFI_IFR_RESTORE_DEFAULTS_OP     0x1F

-#define FRAMEWORK_EFI_IFR_BANNER_OP               0x20

-#define FRAMEWORK_EFI_IFR_INVENTORY_OP            0x21

-#define FRAMEWORK_EFI_IFR_EQ_VAR_VAL_OP           0x22

+#define EFI_IFR_LABEL_OP                0x1D

+#define EFI_IFR_SAVE_DEFAULTS_OP        0x1E

+#define EFI_IFR_RESTORE_DEFAULTS_OP     0x1F

+#define EFI_IFR_BANNER_OP               0x20

+#define EFI_IFR_INVENTORY_OP            0x21

+#define EFI_IFR_EQ_VAR_VAL_OP           0x22

 #define FRAMEWORK_EFI_IFR_ORDERED_LIST_OP         0x23

 #define FRAMEWORK_EFI_IFR_VARSTORE_OP             0x24

-#define FRAMEWORK_EFI_IFR_VARSTORE_SELECT_OP      0x25

-#define FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR_OP 0x26

-#define FRAMEWORK_EFI_IFR_LAST_OPCODE             FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR_OP

-#define FRAMEWORK_EFI_IFR_OEM_OP                  0xFE

-#define FRAMEWORK_EFI_IFR_NV_ACCESS_COMMAND       0xFF

+#define EFI_IFR_VARSTORE_SELECT_OP      0x25

+#define EFI_IFR_VARSTORE_SELECT_PAIR_OP 0x26

+#define EFI_IFR_LAST_OPCODE             EFI_IFR_VARSTORE_SELECT_PAIR_OP

+#define EFI_IFR_OEM_OP                  0xFE

+#define EFI_IFR_NV_ACCESS_COMMAND       0xFF

 

 //

 // Define values for the flags fields in some VFR opcodes. These are

 // bitmasks.

 //

-#define FRAMEWORK_EFI_IFR_FLAG_DEFAULT            0x01

-#define FRAMEWORK_EFI_IFR_FLAG_MANUFACTURING      0x02

-#define FRAMEWORK_EFI_IFR_FLAG_INTERACTIVE        0x04

-#define FRAMEWORK_EFI_IFR_FLAG_NV_ACCESS          0x08

-#define FRAMEWORK_EFI_IFR_FLAG_RESET_REQUIRED     0x10

-#define FRAMEWORK_EFI_IFR_FLAG_LATE_CHECK         0x20

+#define EFI_IFR_FLAG_DEFAULT            0x01

+#define EFI_IFR_FLAG_MANUFACTURING      0x02

+#define EFI_IFR_FLAG_INTERACTIVE        0x04

+#define EFI_IFR_FLAG_NV_ACCESS          0x08

+#define EFI_IFR_FLAG_RESET_REQUIRED     0x10

+#define EFI_IFR_FLAG_LATE_CHECK         0x20

 

 #define EFI_NON_DEVICE_CLASS              0x00  ///< Useful when you do not want something in the Device Manager

 #define EFI_DISK_DEVICE_CLASS             0x01

@@ -100,7 +100,7 @@ typedef UINT16  STRING_REF;
 /// data will be saved, ensure that the NV starting location they refer to is pre-defined in the

 /// NV map.

 ///

-#define FRAMEWORK_EFI_IFR_FLAG_CREATED  128

+#define EFI_IFR_FLAG_CREATED  128

 

 

 #pragma pack(1)

@@ -132,7 +132,7 @@ typedef struct {
 typedef struct {

   FRAMEWORK_EFI_IFR_OP_HEADER       Header;

   UINT16                            LabelId;

-} FRAMEWORK_EFI_IFR_LABEL;

+} EFI_IFR_LABEL;

 

 typedef struct {

   FRAMEWORK_EFI_IFR_OP_HEADER       Header;

@@ -162,11 +162,11 @@ typedef struct {
 

 typedef struct {

   FRAMEWORK_EFI_IFR_OP_HEADER       Header;

-} FRAMEWORK_EFI_IFR_END_FORM;

+} EFI_IFR_END_FORM;

 

 typedef struct {

   FRAMEWORK_EFI_IFR_OP_HEADER       Header;

-} FRAMEWORK_EFI_IFR_END_FORM_SET;

+} EFI_IFR_END_FORM_SET;

 

 //

 // Also notice that the IFR_ONE_OF and IFR_CHECK_BOX are identical in structure......

@@ -196,7 +196,7 @@ typedef struct {
   STRING_REF                        Help;       ///< The string Token for the context-help

   UINT8                             Flags;      ///< If non-zero, means that it is the default option

   UINT16                            Key;        ///< Value to be passed to caller to identify this particular op-code

-} FRAMEWORK_EFI_IFR_CHECKBOX, FRAMEWORK_EFI_IFR_CHECK_BOX;

+} FRAMEWORK_EFI_IFR_CHECKBOX, EFI_IFR_CHECK_BOX;

 

 typedef struct {

   FRAMEWORK_EFI_IFR_OP_HEADER       Header;

@@ -267,13 +267,13 @@ typedef struct {
 

 typedef struct {

   FRAMEWORK_EFI_IFR_OP_HEADER       Header;

-} FRAMEWORK_EFI_IFR_END_ONE_OF;

+} EFI_IFR_END_ONE_OF;

 

 typedef struct {

   FRAMEWORK_EFI_IFR_OP_HEADER       Header;

   UINT16                            Value;

   UINT16                            Key;

-} FRAMEWORK_EFI_IFR_HIDDEN;

+} EFI_IFR_HIDDEN;

 

 ///

 /// Inconsistent with specification here:

@@ -283,18 +283,18 @@ typedef struct {
 typedef struct {

   FRAMEWORK_EFI_IFR_OP_HEADER       Header;

   UINT8                             Flags;

-} FRAMEWORK_EFI_IFR_SUPPRESS;

+} EFI_IFR_SUPPRESS;

 

 typedef struct {

   FRAMEWORK_EFI_IFR_OP_HEADER       Header;

   UINT8                             Flags;

-} FRAMEWORK_EFI_IFR_GRAY_OUT;

+} EFI_IFR_GRAY_OUT;

 

 typedef struct {

   FRAMEWORK_EFI_IFR_OP_HEADER       Header;

   STRING_REF                        Popup;

   UINT8                             Flags;

-} FRAMEWORK_EFI_IFR_INCONSISTENT;

+} EFI_IFR_INCONSISTENT;

 

 typedef struct {

   FRAMEWORK_EFI_IFR_OP_HEADER       Header;

@@ -322,7 +322,7 @@ typedef struct {
   FRAMEWORK_EFI_IFR_OP_HEADER       Header;

   UINT16                            VariableId;   ///< offset into variable storage

   UINT16                            Value;        ///< value to compare against

-} FRAMEWORK_EFI_IFR_EQ_VAR_VAL;

+} EFI_IFR_EQ_VAR_VAL;

 

 typedef struct {

   FRAMEWORK_EFI_IFR_OP_HEADER       Header;

@@ -338,7 +338,7 @@ typedef struct {
 

 typedef struct {

   FRAMEWORK_EFI_IFR_OP_HEADER       Header;

-} FRAMEWORK_EFI_IFR_END_EXPR, FRAMEWORK_EFI_IFR_END_IF;

+} EFI_IFR_END_EXPR, EFI_IFR_END_IF;

 

 typedef struct {

   FRAMEWORK_EFI_IFR_OP_HEADER       Header;

@@ -347,14 +347,14 @@ typedef struct {
   STRING_REF                        Help;

   UINT8                             Flags;

   UINT16                            Key;

-} FRAMEWORK_EFI_IFR_SAVE_DEFAULTS;

+} EFI_IFR_SAVE_DEFAULTS;

 

 typedef struct {

   FRAMEWORK_EFI_IFR_OP_HEADER       Header;

   STRING_REF                        Help;

   STRING_REF                        Text;

   STRING_REF                        TextTwo;    ///< optional text

-} FRAMEWORK_EFI_IFR_INVENTORY;

+} EFI_IFR_INVENTORY;

 

 typedef struct {

   FRAMEWORK_EFI_IFR_OP_HEADER       Header;

@@ -366,7 +366,7 @@ typedef struct {
 typedef struct {

   FRAMEWORK_EFI_IFR_OP_HEADER       Header;

   UINT16                            VarId;      ///< variable store ID, as referenced elsewhere in the form

-} FRAMEWORK_EFI_IFR_VARSTORE_SELECT;

+} EFI_IFR_VARSTORE_SELECT;

 

 ///

 /// Used for the ideqid VFR statement where two variable stores may be referenced in the

@@ -378,24 +378,24 @@ typedef struct {
   FRAMEWORK_EFI_IFR_OP_HEADER       Header;

   UINT16                            VarId;          ///< variable store ID, as referenced elsewhere in the form

   UINT16                            SecondaryVarId; ///< variable store ID, as referenced elsewhere in the form

-} FRAMEWORK_EFI_IFR_VARSTORE_SELECT_PAIR;

+} EFI_IFR_VARSTORE_SELECT_PAIR;

 

 ///

 /// Save defaults and restore defaults have same structure

 ///

-#define FRAMEWORK_EFI_IFR_RESTORE_DEFAULTS  FRAMEWORK_EFI_IFR_SAVE_DEFAULTS

+#define EFI_IFR_RESTORE_DEFAULTS  EFI_IFR_SAVE_DEFAULTS

 

 typedef struct {

   FRAMEWORK_EFI_IFR_OP_HEADER       Header;

   STRING_REF                        Title;        ///< The string token for the banner title

   UINT16                            LineNumber;   ///< 1-based line number

   UINT8                             Alignment;    ///< left, center, or right-aligned

-} FRAMEWORK_EFI_IFR_BANNER;

+} EFI_IFR_BANNER;

 

-#define FRAMEWORK_EFI_IFR_BANNER_ALIGN_LEFT   0

-#define FRAMEWORK_EFI_IFR_BANNER_ALIGN_CENTER 1

-#define FRAMEWORK_EFI_IFR_BANNER_ALIGN_RIGHT  2

-#define FRAMEWORK_EFI_IFR_BANNER_TIMEOUT      0xFF

+#define EFI_IFR_BANNER_ALIGN_LEFT   0

+#define EFI_IFR_BANNER_ALIGN_CENTER 1

+#define EFI_IFR_BANNER_ALIGN_RIGHT  2

+#define EFI_IFR_BANNER_TIMEOUT      0xFF

 

 #pragma pack()

 

diff --git a/IntelFrameworkPkg/Include/Framework/Hob.h b/IntelFrameworkPkg/Include/Framework/Hob.h
index 2e5fc0ec84..810a51fe07 100644
--- a/IntelFrameworkPkg/Include/Framework/Hob.h
+++ b/IntelFrameworkPkg/Include/Framework/Hob.h
@@ -15,8 +15,8 @@
 

 **/

 

-#ifndef _FRAMEWORK_HOB_H_

-#define _FRAMEWORK_HOB_H_

+#ifndef _HOB_H_

+#define _HOB_H_

 

 ///

 /// Capsule volume HOB -- identical to a firmware volume

diff --git a/IntelFrameworkPkg/Include/Framework/SmmCis.h b/IntelFrameworkPkg/Include/Framework/SmmCis.h
index 122c471add..b580dbe639 100644
--- a/IntelFrameworkPkg/Include/Framework/SmmCis.h
+++ b/IntelFrameworkPkg/Include/Framework/SmmCis.h
@@ -13,8 +13,8 @@
 

 **/

 

-#ifndef _FRAMEWORK_SMM_CIS_H_

-#define _FRAMEWORK_SMM_CIS_H_

+#ifndef _SMM_CIS_H_

+#define _SMM_CIS_H_

 

 #define EFI_SMM_CPU_IO_GUID \

   { \

diff --git a/IntelFrameworkPkg/Include/Framework/StatusCode.h b/IntelFrameworkPkg/Include/Framework/StatusCode.h
index cdd9d44c19..5711aa43f1 100644
--- a/IntelFrameworkPkg/Include/Framework/StatusCode.h
+++ b/IntelFrameworkPkg/Include/Framework/StatusCode.h
@@ -29,9 +29,10 @@
 

 **/

 

-#ifndef _FRAMEWORK_STATUS_CODE_H_

-#define _FRAMEWORK_STATUS_CODE_H_

+#ifndef _STATUS_CODE_H_

+#define _STATUS_CODE_H_

 

+#include <Protocol/DebugSupport.h>

 //

 // Section 1

 // Class definitions

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;

 };