Removed extra typedefs on structures to fix error generated by gcc.

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

35 files changed, 78 insertions, 86 deletions

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/AcpiS3Save/AcpiS3Save.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/AcpiS3Save/AcpiS3Save.h
index 2cf554b308..a90a3bd76b 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/AcpiS3Save/AcpiS3Save.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/AcpiS3Save/AcpiS3Save.h
@@ -56,10 +56,10 @@ EFI_STATUS
   OUT UINTN                         * Size

 );

 

-typedef struct _EFI_ACPI_S3_SAVE_PROTOCOL {

+struct _EFI_ACPI_S3_SAVE_PROTOCOL {

   EFI_ACPI_GET_LEGACY_MEMORY_SIZE   GetLegacyMemorySize;

   EFI_ACPI_S3_SAVE                  S3Save;

-} EFI_ACPI_S3_SAVE_PROTOCOL;

+};

 

 extern EFI_GUID gEfiAcpiS3SaveGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/AcpiSupport/AcpiSupport.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/AcpiSupport/AcpiSupport.h
index b0ae333593..8f668529cc 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/AcpiSupport/AcpiSupport.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/AcpiSupport/AcpiSupport.h
@@ -116,10 +116,10 @@ EFI_STATUS
 //

 // ACPI Support Protocol

 //

-typedef struct _EFI_ACPI_SUPPORT_PROTOCOL {

+struct _EFI_ACPI_SUPPORT_PROTOCOL {

   EFI_ACPI_GET_ACPI_TABLE GetAcpiTable;

   EFI_ACPI_SET_ACPI_TABLE SetAcpiTable;

   EFI_ACPI_PUBLISH_TABLES PublishTables;

-} EFI_ACPI_SUPPORT_PROTOCOL;

+};

 

 #endif

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/BootScriptSave/BootScriptSave.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/BootScriptSave/BootScriptSave.h
index 09c62217d0..2955fa2814 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/BootScriptSave/BootScriptSave.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/BootScriptSave/BootScriptSave.h
@@ -63,10 +63,10 @@ EFI_STATUS
 //

 // S3 Save Protocol data structure

 //

-typedef struct _EFI_BOOT_SCRIPT_SAVE_PROTOCOL {

+struct _EFI_BOOT_SCRIPT_SAVE_PROTOCOL {

   EFI_BOOT_SCRIPT_WRITE       Write;

   EFI_BOOT_SCRIPT_CLOSE_TABLE CloseTable;

-} EFI_BOOT_SCRIPT_SAVE_PROTOCOL;

+};

 

 extern EFI_GUID gEfiBootScriptSaveGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/CpuIo/CpuIo.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/CpuIo/CpuIo.h
index c4944b4368..31a5cb1193 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/CpuIo/CpuIo.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/CpuIo/CpuIo.h
@@ -83,10 +83,10 @@ typedef struct {
 // EFI_CPU_IO_PROTOCOL

 // *******************************************************

 //

-typedef struct _EFI_CPU_IO_PROTOCOL {

+struct _EFI_CPU_IO_PROTOCOL {

   EFI_CPU_IO_PROTOCOL_ACCESS  Mem;

   EFI_CPU_IO_PROTOCOL_ACCESS  Io;

-} EFI_CPU_IO_PROTOCOL;

+};

 

 extern EFI_GUID gEfiCpuIoProtocolGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/DataHub/DataHub.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/DataHub/DataHub.h
index 2a2d86f5ef..2af9556220 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/DataHub/DataHub.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/DataHub/DataHub.h
@@ -113,12 +113,12 @@ EFI_STATUS
   IN EFI_EVENT                FilterEvent

   );

 

-typedef struct _EFI_DATA_HUB_PROTOCOL {

+struct _EFI_DATA_HUB_PROTOCOL {

   EFI_DATA_HUB_LOG_DATA                 LogData;

   EFI_DATA_HUB_GET_NEXT_RECORD          GetNextRecord;

   EFI_DATA_HUB_REGISTER_FILTER_DRIVER   RegisterFilterDriver;

   EFI_DATA_HUB_UNREGISTER_FILTER_DRIVER UnregisterFilterDriver;

-} EFI_DATA_HUB_PROTOCOL;

+};

 

 extern EFI_GUID gEfiDataHubProtocolGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/FirmwareVolume/FirmwareVolume.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/FirmwareVolume/FirmwareVolume.h
index 62bc492273..c44e628795 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/FirmwareVolume/FirmwareVolume.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/FirmwareVolume/FirmwareVolume.h
@@ -38,8 +38,6 @@ Abstract:
   }

 

 

-EFI_FORWARD_DECLARATION (EFI_FIRMWARE_VOLUME_PROTOCOL);

-

 //

 // ************************************************************

 // EFI_FV_ATTRIBUTES bit definitions

@@ -285,7 +283,7 @@ Returns:
   EFI_ACCESS_DENIED

 

 --*/

-typedef struct _EFI_FIRMWARE_VOLUME_PROTOCOL {

+struct _EFI_FIRMWARE_VOLUME_PROTOCOL {

   FV_GET_ATTRIBUTES GetVolumeAttributes;

   FV_SET_ATTRIBUTES SetVolumeAttributes;

   FV_READ_FILE      ReadFile;

@@ -294,7 +292,7 @@ typedef struct _EFI_FIRMWARE_VOLUME_PROTOCOL {
   FV_GET_NEXT_FILE  GetNextFile;

   UINT32            KeySize;

   EFI_HANDLE        ParentHandle;

-} EFI_FIRMWARE_VOLUME_PROTOCOL;

+};

 

 extern EFI_GUID gEfiFirmwareVolumeProtocolGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/FirmwareVolume2/FirmwareVolume2.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/FirmwareVolume2/FirmwareVolume2.h
index 7a56aa2ad9..9e256655b0 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/FirmwareVolume2/FirmwareVolume2.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/FirmwareVolume2/FirmwareVolume2.h
@@ -177,7 +177,7 @@ EFI_STATUS
   );

 

 

-typedef struct _EFI_FIRMWARE_VOLUME2_PROTOCOL {

+struct _EFI_FIRMWARE_VOLUME2_PROTOCOL {

   EFI_FV_GET_ATTRIBUTES    GetVolumeAttributes;

   EFI_FV_SET_ATTRIBUTES    SetVolumeAttributes;

   EFI_FV_READ_FILE         ReadFile;

@@ -188,7 +188,7 @@ typedef struct _EFI_FIRMWARE_VOLUME2_PROTOCOL {
   EFI_HANDLE               ParentHandle;

   EFI_FV_GET_INFO          GetInfo;

   EFI_FV_SET_INFO          SetInfo;

-} EFI_FIRMWARE_VOLUME2_PROTOCOL;

+};

 

 extern EFI_GUID gEfiFirmwareVolume2ProtocolGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/FirmwareVolumeBlock/FirmwareVolumeBlock.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/FirmwareVolumeBlock/FirmwareVolumeBlock.h
index 8502810e1b..328ca18814 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/FirmwareVolumeBlock/FirmwareVolumeBlock.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/FirmwareVolumeBlock/FirmwareVolumeBlock.h
@@ -235,7 +235,7 @@ Returns:
 --*/

 ;

 

-typedef struct _EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL {

+struct _EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL {

   EFI_FVB_GET_ATTRIBUTES        GetVolumeAttributes;

   EFI_FVB_SET_ATTRIBUTES        SetVolumeAttributes;

   EFI_FVB_GET_PHYSICAL_ADDRESS  GetPhysicalAddress;

@@ -244,7 +244,7 @@ typedef struct _EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL {
   EFI_FVB_WRITE                 Write;

   EFI_FVB_ERASE_BLOCKS          EraseBlocks;

   EFI_HANDLE                    ParentHandle;

-} EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL;

+};

 

 extern EFI_GUID gEfiFirmwareVolumeBlockProtocolGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/FormBrowser/FormBrowser.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/FormBrowser/FormBrowser.h
index 566f7cc23b..bdf8e506c1 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/FormBrowser/FormBrowser.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/FormBrowser/FormBrowser.h
@@ -36,8 +36,6 @@ Abstract:
 //

 // Forward reference for pure ANSI compatability

 //

-EFI_FORWARD_DECLARATION (EFI_FORM_BROWSER_PROTOCOL);

-

 typedef struct _EFI_FORM_BROWSER_PROTOCOL EFI_FORM_BROWSER_PROTOCOL;

 

 typedef struct {

@@ -87,10 +85,10 @@ EFI_STATUS
   ...

   );

 

-typedef struct _EFI_FORM_BROWSER_PROTOCOL {

+struct _EFI_FORM_BROWSER_PROTOCOL {

   EFI_SEND_FORM     SendForm;

   EFI_CREATE_POP_UP CreatePopUp;

-} EFI_FORM_BROWSER_PROTOCOL;

+};

 

 extern EFI_GUID gEfiFormBrowserProtocolGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/FormCallback/FormCallback.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/FormCallback/FormCallback.h
index 5091f3e90c..1a6df8fd6d 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/FormCallback/FormCallback.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/FormCallback/FormCallback.h
@@ -36,8 +36,6 @@ Abstract:
 //

 // Forward reference for pure ANSI compatability

 //

-EFI_FORWARD_DECLARATION (EFI_FORM_CALLBACK_PROTOCOL);

-

 typedef struct _EFI_FORM_CALLBACK_PROTOCOL  EFI_FORM_CALLBACK_PROTOCOL;

 

 #define RESET_REQUIRED  1 // Flags setting to signify that the callback operation resulted in an eventual

@@ -109,11 +107,11 @@ EFI_STATUS
   OUT    EFI_HII_CALLBACK_PACKET       **Packet

   );

 

-typedef struct _EFI_FORM_CALLBACK_PROTOCOL {

+struct _EFI_FORM_CALLBACK_PROTOCOL {

   EFI_NV_READ       NvRead;

   EFI_NV_WRITE      NvWrite;

   EFI_FORM_CALLBACK Callback;

-} EFI_FORM_CALLBACK_PROTOCOL;

+};

 

 extern EFI_GUID gEfiFormCallbackProtocolGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/Hii/Hii.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/Hii/Hii.h
index fd6c951653..ad712805a1 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/Hii/Hii.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/Hii/Hii.h
@@ -36,8 +36,6 @@ Abstract:
 //

 // Forward reference for pure ANSI compatability

 //

-EFI_FORWARD_DECLARATION (EFI_HII_PROTOCOL);

-

 typedef struct _EFI_HII_PROTOCOL  EFI_HII_PROTOCOL;

 

 //

@@ -585,7 +583,7 @@ EFI_STATUS
   OUT    EFI_KEY_DESCRIPTOR  * Descriptor

   );

 

-typedef struct _EFI_HII_PROTOCOL {

+struct _EFI_HII_PROTOCOL {

   EFI_HII_NEW_PACK            NewPack;

   EFI_HII_REMOVE_PACK         RemovePack;

   EFI_HII_FIND_HANDLES        FindHandles;

@@ -606,7 +604,7 @@ typedef struct _EFI_HII_PROTOCOL {
   EFI_HII_UPDATE_FORM         UpdateForm;

 

   EFI_HII_GET_KEYBOARD_LAYOUT GetKeyboardLayout;

-} EFI_HII_PROTOCOL;

+};

 

 extern EFI_GUID gEfiHiiProtocolGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/IdeControllerInit/IdeControllerInit.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/IdeControllerInit/IdeControllerInit.h
index 06df0192c5..06f05cdaf8 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/IdeControllerInit/IdeControllerInit.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/IdeControllerInit/IdeControllerInit.h
@@ -331,7 +331,7 @@ EFI_STATUS
 // An IDE Bus driver wants to manage an IDE bus and possible IDE devices will have to retrieve the 

 // EFI_IDE_CONTROLLER_INIT_PROTOCOL instances.

 //

-typedef struct _EFI_IDE_CONTROLLER_INIT_PROTOCOL {

+struct _EFI_IDE_CONTROLLER_INIT_PROTOCOL {

   EFI_IDE_CONTROLLER_GET_CHANNEL_INFO    GetChannelInfo;

   EFI_IDE_CONTROLLER_NOTIFY_PHASE        NotifyPhase;

   EFI_IDE_CONTROLLER_SUBMIT_DATA         SubmitData;

@@ -340,7 +340,7 @@ typedef struct _EFI_IDE_CONTROLLER_INIT_PROTOCOL {
   EFI_IDE_CONTROLLER_SET_TIMING          SetTiming;

   BOOLEAN                                                        EnumAll;

   UINT8                                                               ChannelCount; 

-} EFI_IDE_CONTROLLER_INIT_PROTOCOL;

+};

 

 

 extern EFI_GUID gEfiIdeControllerInitProtocolGuid;

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/Legacy8259/Legacy8259.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/Legacy8259/Legacy8259.h
index 3b7c826e38..c9bb11f9ba 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/Legacy8259/Legacy8259.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/Legacy8259/Legacy8259.h
@@ -300,7 +300,7 @@ EFI_STATUS
 --*/

 ;

 

-typedef struct _EFI_LEGACY_8259_PROTOCOL {

+struct _EFI_LEGACY_8259_PROTOCOL {

   EFI_LEGACY_8259_SET_VECTOR_BASE     SetVectorBase;

   EFI_LEGACY_8259_GET_MASK            GetMask;

   EFI_LEGACY_8259_SET_MASK            SetMask;

@@ -310,7 +310,7 @@ typedef struct _EFI_LEGACY_8259_PROTOCOL {
   EFI_LEGACY_8259_DISABLE_IRQ         DisableIrq;

   EFI_LEGACY_8259_GET_INTERRUPT_LINE  GetInterruptLine;

   EFI_LEGACY_8259_END_OF_INTERRUPT    EndOfInterrupt;

-} EFI_LEGACY_8259_PROTOCOL;

+};

 

 extern EFI_GUID gEfiLegacy8259ProtocolGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyBios/LegacyBios.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyBios/LegacyBios.h
index 9ce922144c..40964d8c26 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyBios/LegacyBios.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyBios/LegacyBios.h
@@ -694,7 +694,7 @@ Returns:
 --*/

 ;

 

-typedef struct _EFI_LEGACY_BIOS_PROTOCOL {

+struct _EFI_LEGACY_BIOS_PROTOCOL {

   EFI_LEGACY_BIOS_INT86                       Int86;

   EFI_LEGACY_BIOS_FARCALL86                   FarCall86;

   EFI_LEGACY_BIOS_CHECK_ROM                   CheckPciRom;

@@ -707,7 +707,7 @@ typedef struct _EFI_LEGACY_BIOS_PROTOCOL {
   EFI_LEGACY_BIOS_GET_LEGACY_REGION           GetLegacyRegion;

   EFI_LEGACY_BIOS_COPY_LEGACY_REGION          CopyLegacyRegion;

   EFI_LEGACY_BIOS_BOOT_UNCONVENTIONAL_DEVICE  BootUnconventionalDevice;

-} EFI_LEGACY_BIOS_PROTOCOL;

+};

 

 extern EFI_GUID gEfiLegacyBiosProtocolGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyBiosPlatform/LegacyBiosPlatform.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyBiosPlatform/LegacyBiosPlatform.h
index 1a1a0fa406..fc1ace6c7f 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyBiosPlatform/LegacyBiosPlatform.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyBiosPlatform/LegacyBiosPlatform.h
@@ -313,7 +313,7 @@ EFI_STATUS
 --*/

 ;

 

-typedef struct _EFI_LEGACY_BIOS_PLATFORM_PROTOCOL {

+struct _EFI_LEGACY_BIOS_PLATFORM_PROTOCOL {

   EFI_LEGACY_BIOS_PLATFORM_GET_PLATFORM_INFO    GetPlatformInfo;

   EFI_LEGACY_BIOS_PLATFORM_GET_PLATFORM_HANDLE  GetPlatformHandle;

   EFI_LEGACY_BIOS_PLATFORM_SMM_INIT             SmmInit;

@@ -321,7 +321,7 @@ typedef struct _EFI_LEGACY_BIOS_PLATFORM_PROTOCOL {
   EFI_LEGACY_BIOS_PLATFORM_GET_ROUTING_TABLE    GetRoutingTable;

   EFI_LEGACY_BIOS_PLATFORM_TRANSLATE_PIRQ       TranslatePirq;

   EFI_LEGACY_BIOS_PLATFORM_PREPARE_TO_BOOT      PrepareToBoot;

-} EFI_LEGACY_BIOS_PLATFORM_PROTOCOL;

+};

 

 extern EFI_GUID gEfiLegacyBiosPlatformProtocolGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyInterrupt/LegacyInterrupt.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyInterrupt/LegacyInterrupt.h
index ecbe06af59..386c4b91c3 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyInterrupt/LegacyInterrupt.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyInterrupt/LegacyInterrupt.h
@@ -124,12 +124,12 @@ EFI_STATUS
     EFI_INVALID_PARAMETER - Invalid PIRQ number

 

 --*/

-typedef struct _EFI_LEGACY_INTERRUPT_PROTOCOL {

+struct _EFI_LEGACY_INTERRUPT_PROTOCOL {

   EFI_LEGACY_INTERRUPT_GET_NUMBER_PIRQS GetNumberPirqs;

   EFI_LEGACY_INTERRUPT_GET_LOCATION     GetLocation;

   EFI_LEGACY_INTERRUPT_READ_PIRQ        ReadPirq;

   EFI_LEGACY_INTERRUPT_WRITE_PIRQ       WritePirq;

-} EFI_LEGACY_INTERRUPT_PROTOCOL;

+};

 

 extern EFI_GUID gEfiLegacyInterruptProtocolGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyRegion/LegacyRegion.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyRegion/LegacyRegion.h
index d70e8ffa2d..bcee474563 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyRegion/LegacyRegion.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/LegacyRegion/LegacyRegion.h
@@ -70,12 +70,12 @@ EFI_STATUS
   OUT UINT32                              *Granularity OPTIONAL

   );

 

-typedef struct _EFI_LEGACY_REGION_PROTOCOL {

+struct _EFI_LEGACY_REGION_PROTOCOL {

   EFI_LEGACY_REGION_DECODE    Decode;

   EFI_LEGACY_REGION_LOCK      Lock;

   EFI_LEGACY_REGION_BOOT_LOCK BootLock;

   EFI_LEGACY_REGION_UNLOCK    UnLock;

-} EFI_LEGACY_REGION_PROTOCOL;

+};

 

 extern EFI_GUID gEfiLegacyRegionProtocolGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/PciHostBridgeResourceAllocation/PciHostBridgeResourceAllocation.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/PciHostBridgeResourceAllocation/PciHostBridgeResourceAllocation.h
index 6e7e1f0feb..0715ca2367 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/PciHostBridgeResourceAllocation/PciHostBridgeResourceAllocation.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/PciHostBridgeResourceAllocation/PciHostBridgeResourceAllocation.h
@@ -348,7 +348,7 @@ Returns:
 

 

 

-typedef struct _EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL {

+struct _EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL {

   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_NOTIFY_PHASE           NotifyPhase;

   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_GET_NEXT_ROOT_BRIDGE   GetNextRootBridge;

   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_GET_ATTRIBUTES         GetAllocAttributes;

@@ -357,7 +357,7 @@ typedef struct _EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL {
   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_SUBMIT_RESOURCES       SubmitResources;

   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_GET_PROPOSED_RESOURCES GetProposedResources;

   EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL_PREPROCESS_CONTROLLER  PreprocessController;

-} EFI_PCI_HOST_BRIDGE_RESOURCE_ALLOCATION_PROTOCOL;

+};

 

 extern EFI_GUID gEfiPciHostBridgeResourceAllocationProtocolGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/PciHotPlugInit/PciHotPlugInit.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/PciHotPlugInit/PciHotPlugInit.h
index ff11e86c19..1972d591ef 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/PciHotPlugInit/PciHotPlugInit.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/PciHotPlugInit/PciHotPlugInit.h
@@ -85,11 +85,11 @@ EFI_STATUS
 //

 

 

-typedef struct _EFI_PCI_HOT_PLUG_INIT_PROTOCOL {

+struct _EFI_PCI_HOT_PLUG_INIT_PROTOCOL {

   EFI_GET_ROOT_HPC_LIST                                  GetRootHpcList;

   EFI_INITIALIZE_ROOT_HPC                                InitializeRootHpc;

   EFI_GET_PCI_HOT_PLUG_PADDING                           GetResourcePadding;

-} EFI_PCI_HOT_PLUG_INIT_PROTOCOL;

+};

 

 

 extern EFI_GUID gEfiPciHotPlugInitProtocolGuid;

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/PciPlatform/PciPlatform.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/PciPlatform/PciPlatform.h
index 38a9b2bceb..12c7a07579 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/PciPlatform/PciPlatform.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/PciPlatform/PciPlatform.h
@@ -197,12 +197,12 @@ EFI_STATUS
 ;

 

 

-typedef struct _EFI_PCI_PLATFORM_PROTOCOL {

+struct _EFI_PCI_PLATFORM_PROTOCOL {

   EFI_PCI_PLATFORM_PHASE_NOTIFY          PhaseNotify;

   EFI_PCI_PLATFORM_PREPROCESS_CONTROLLER PlatformPrepController;

   EFI_PCI_PLATFORM_GET_PLATFORM_POLICY   GetPlatformPolicy;

   EFI_PCI_PLATFORM_GET_PCI_ROM           GetPciRom;

-} EFI_PCI_PLATFORM_PROTOCOL;

+};

 

 extern EFI_GUID   gEfiPciPlatformProtocolGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SectionExtraction/SectionExtraction.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SectionExtraction/SectionExtraction.h
index 849a2c861e..4f915ce43a 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SectionExtraction/SectionExtraction.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SectionExtraction/SectionExtraction.h
@@ -72,11 +72,11 @@ EFI_STATUS
 //

 // Protocol definition

 //

-typedef struct _EFI_SECTION_EXTRACTION_PROTOCOL {

+struct _EFI_SECTION_EXTRACTION_PROTOCOL {

   EFI_OPEN_SECTION_STREAM   OpenSectionStream;

   EFI_GET_SECTION           GetSection;

   EFI_CLOSE_SECTION_STREAM  CloseSectionStream;

-} EFI_SECTION_EXTRACTION_PROTOCOL;

+};

 

 extern EFI_GUID gEfiSectionExtractionProtocolGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/Smbus/Smbus.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/Smbus/Smbus.h
index f6d27098f8..407d143a3d 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/Smbus/Smbus.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/Smbus/Smbus.h
@@ -82,12 +82,12 @@ EFI_STATUS
   IN      EFI_SMBUS_NOTIFY_FUNCTION     NotifyFunction

   );

 

-typedef struct _EFI_SMBUS_HC_PROTOCOL {

+struct _EFI_SMBUS_HC_PROTOCOL {

   EFI_SMBUS_HC_EXECUTE_OPERATION    Execute;

   EFI_SMBUS_HC_PROTOCOL_ARP_DEVICE  ArpDevice;

   EFI_SMBUS_HC_PROTOCOL_GET_ARP_MAP GetArpMap;

   EFI_SMBUS_HC_PROTOCOL_NOTIFY      Notify;

-} EFI_SMBUS_HC_PROTOCOL;

+};

 

 extern EFI_GUID gEfiSmbusProtocolGuid;

 #endif

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmAccess/SmmAccess.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmAccess/SmmAccess.h
index 24e2cbc720..4a78d7606c 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmAccess/SmmAccess.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmAccess/SmmAccess.h
@@ -65,14 +65,14 @@ EFI_STATUS
   IN OUT EFI_SMRAM_DESCRIPTOR            * SmramMap

   );

 

-typedef struct _EFI_SMM_ACCESS_PROTOCOL {

+struct _EFI_SMM_ACCESS_PROTOCOL {

   EFI_SMM_OPEN          Open;

   EFI_SMM_CLOSE         Close;

   EFI_SMM_LOCK          Lock;

   EFI_SMM_CAPABILITIES  GetCapabilities;

   BOOLEAN               LockState;

   BOOLEAN               OpenState;

-} EFI_SMM_ACCESS_PROTOCOL;

+};

 

 extern EFI_GUID gEfiSmmAccessProtocolGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmBase/SmmBase.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmBase/SmmBase.h
index 9cda78765f..c92545a178 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmBase/SmmBase.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmBase/SmmBase.h
@@ -85,10 +85,10 @@ typedef struct {
   EFI_SMM_CPU_IO  Write;

 } EFI_SMM_IO_ACCESS;

 

-typedef struct _EFI_SMM_CPU_IO_INTERFACE {

+struct _EFI_SMM_CPU_IO_INTERFACE {

   EFI_SMM_IO_ACCESS Mem;

   EFI_SMM_IO_ACCESS Io;

-} EFI_SMM_CPU_IO_INTERFACE;

+};

 

 typedef

 EFI_STATUS

@@ -134,7 +134,7 @@ EFI_STATUS
   IN  OUT VOID                            *ProcArguments OPTIONAL

   );

 

-typedef struct _EFI_SMM_CPU_SAVE_STATE {

+struct _EFI_SMM_CPU_SAVE_STATE {

   UINT8   Reserved1[248];

   UINT32  SMBASE;

   UINT32  SMMRevId;

@@ -163,7 +163,7 @@ typedef struct _EFI_SMM_CPU_SAVE_STATE {
   UINT32  EFLAGS;

   UINT32  CR3;

   UINT32  CR0;

-} EFI_SMM_CPU_SAVE_STATE;

+};

 

 typedef struct {

   UINT8   Reserved19[760];    // FC00

@@ -341,7 +341,7 @@ typedef struct {
   UINT32  CR0;

 } EFI_SMM_CPU_CT_NOT_ENABLED_SAVE_STATE;

 

-typedef struct _EFI_SMM_OPTIONAL_FP_SAVE_STATE {

+struct _EFI_SMM_OPTIONAL_FP_SAVE_STATE {

   UINT16  Fcw;

   UINT16  Fsw;

   UINT16  Ftw;

@@ -361,7 +361,7 @@ typedef struct _EFI_SMM_OPTIONAL_FP_SAVE_STATE {
   UINT8   St0Mm6[10], Rsvd9[6];

   UINT8   St0Mm7[10], Rsvd10[6];

   UINT8   Rsvd11[22 * 16];

-} EFI_SMM_OPTIONAL_FP_SAVE_STATE;

+};

 

 typedef struct _EFI_SMM_OPTIONAL_FP_SAVE_STATE32 {

   UINT16  Fcw;

@@ -464,7 +464,7 @@ EFI_STATUS
 //

 // System Management System Table (SMST)

 //

-typedef struct _EFI_SMM_SYSTEM_TABLE {

+struct _EFI_SMM_SYSTEM_TABLE {

   EFI_TABLE_HEADER                    Hdr;

 

   CHAR16                              *SmmFirmwareVendor;

@@ -505,7 +505,7 @@ typedef struct _EFI_SMM_SYSTEM_TABLE {
   UINTN                               NumberOfTableEntries;

   EFI_CONFIGURATION_TABLE             *SmmConfigurationTable;

 

-} EFI_SMM_SYSTEM_TABLE;

+};

 

 //

 // SMM Handler Definition

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

 ;

 

-typedef struct _EFI_SMM_BASE_PROTOCOL {

+struct _EFI_SMM_BASE_PROTOCOL {

   EFI_SMM_REGISTER_HANDLER    Register;

   EFI_SMM_UNREGISTER_HANDLER  UnRegister;

   EFI_SMM_COMMUNICATE         Communicate;

@@ -788,7 +788,7 @@ typedef struct _EFI_SMM_BASE_PROTOCOL {
   EFI_SMM_ALLOCATE_POOL       SmmAllocatePool;

   EFI_SMM_FREE_POOL           SmmFreePool;

   EFI_SMM_GET_SMST_LOCATION   GetSmstLocation;

-} EFI_SMM_BASE_PROTOCOL;

+};

 

 extern EFI_GUID gEfiSmmBaseProtocolGuid;

 extern EFI_GUID gEfiSmmCpuIoGuid;

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmControl/SmmControl.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmControl/SmmControl.h
index cf1bff0ccb..dd7525d3da 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmControl/SmmControl.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmControl/SmmControl.h
@@ -67,12 +67,12 @@ EFI_STATUS
   IN OUT EFI_SMM_CONTROL_REGISTER       * SmiRegister

   );

 

-typedef struct _EFI_SMM_CONTROL_PROTOCOL {

+struct _EFI_SMM_CONTROL_PROTOCOL {

   EFI_SMM_ACTIVATE          Trigger;

   EFI_SMM_DEACTIVATE        Clear;

   EFI_SMM_GET_REGISTER_INFO GetRegisterInfo;

   UINTN                     MinimumTriggerPeriod;

-} EFI_SMM_CONTROL_PROTOCOL;

+};

 

 extern EFI_GUID gEfiSmmControlProtocolGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmCpuState/SmmCpuState.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmCpuState/SmmCpuState.h
index 1a6c79d0ca..a46bfa5564 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmCpuState/SmmCpuState.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmCpuState/SmmCpuState.h
@@ -34,9 +34,9 @@ Revision History
 #define EFI_SMM_CPU_SAVE_STATE_PROTOCOL_GUID  \

   { 0x21f302ad, 0x6e94, 0x471b, 0x84, 0xbc, 0xb1, 0x48, 0x0, 0x40, 0x3a, 0x1d }

 

-typedef struct _EFI_SMM_CPU_SAVE_STATE_PROTOCOL {

+struct _EFI_SMM_CPU_SAVE_STATE_PROTOCOL {

   EFI_SMM_CPU_STATE                 **CpuSaveState;

-} EFI_SMM_CPU_SAVE_STATE_PROTOCOL;

+};

 

 extern EFI_GUID gEfiSmmCpuSaveStateProtocolGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmGpiDispatch/SmmGpiDispatch.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmGpiDispatch/SmmGpiDispatch.h
index 861418e227..d1b4d770f5 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmGpiDispatch/SmmGpiDispatch.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmGpiDispatch/SmmGpiDispatch.h
@@ -141,11 +141,11 @@ EFI_STATUS
 //

 // Interface structure for the SMM GPI SMI Dispatch Protocol

 //

-typedef struct _EFI_SMM_GPI_DISPATCH_PROTOCOL {

+struct _EFI_SMM_GPI_DISPATCH_PROTOCOL {

   EFI_SMM_GPI_REGISTER    Register;

   EFI_SMM_GPI_UNREGISTER  UnRegister;

   UINTN                   NumSupportedGpis;

-} EFI_SMM_GPI_DISPATCH_PROTOCOL;

+};

 

 extern EFI_GUID gEfiSmmGpiDispatchProtocolGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmIchnDispatch/SmmIchnDispatch.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmIchnDispatch/SmmIchnDispatch.h
index 70d92f4620..bf60460c8a 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmIchnDispatch/SmmIchnDispatch.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmIchnDispatch/SmmIchnDispatch.h
@@ -194,10 +194,10 @@ EFI_STATUS
 //

 // Interface structure for the SMM Ich n specific SMI Dispatch Protocol

 //

-typedef struct _EFI_SMM_ICHN_DISPATCH_PROTOCOL {

+struct _EFI_SMM_ICHN_DISPATCH_PROTOCOL {

   EFI_SMM_ICHN_REGISTER   Register;

   EFI_SMM_ICHN_UNREGISTER UnRegister;

-} EFI_SMM_ICHN_DISPATCH_PROTOCOL;

+};

 

 extern EFI_GUID gEfiSmmIchnDispatchProtocolGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmPeriodicTimerDispatch/SmmPeriodicTimerDispatch.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmPeriodicTimerDispatch/SmmPeriodicTimerDispatch.h
index 9aabb0c671..5ad639a941 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmPeriodicTimerDispatch/SmmPeriodicTimerDispatch.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmPeriodicTimerDispatch/SmmPeriodicTimerDispatch.h
@@ -194,11 +194,11 @@ EFI_STATUS
 //

 // Interface structure for the SMM Periodic Timer Dispatch Protocol

 //

-typedef struct _EFI_SMM_PERIODIC_TIMER_DISPATCH_PROTOCOL {

+struct _EFI_SMM_PERIODIC_TIMER_DISPATCH_PROTOCOL {

   EFI_SMM_PERIODIC_TIMER_REGISTER   Register;

   EFI_SMM_PERIODIC_TIMER_UNREGISTER UnRegister;

   EFI_SMM_PERIODIC_TIMER_INTERVAL   GetNextShorterInterval;

-} EFI_SMM_PERIODIC_TIMER_DISPATCH_PROTOCOL;

+};

 

 extern EFI_GUID gEfiSmmPeriodicTimerDispatchProtocolGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmPowerButtonDispatch/SmmPowerButtonDispatch.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmPowerButtonDispatch/SmmPowerButtonDispatch.h
index 2e53bf583d..ab908f5fb5 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmPowerButtonDispatch/SmmPowerButtonDispatch.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmPowerButtonDispatch/SmmPowerButtonDispatch.h
@@ -143,10 +143,10 @@ EFI_STATUS
 //

 // Interface structure for the SMM Power Button SMI Dispatch Protocol

 //

-typedef struct _EFI_SMM_POWER_BUTTON_DISPATCH_PROTOCOL {

+struct _EFI_SMM_POWER_BUTTON_DISPATCH_PROTOCOL {

   EFI_SMM_POWER_BUTTON_REGISTER   Register;

   EFI_SMM_POWER_BUTTON_UNREGISTER UnRegister;

-} EFI_SMM_POWER_BUTTON_DISPATCH_PROTOCOL;

+};

 

 extern EFI_GUID gEfiSmmPowerButtonDispatchProtocolGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmStandbyButtonDispatch/SmmStandbyButtonDispatch.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmStandbyButtonDispatch/SmmStandbyButtonDispatch.h
index 9426cd4ffa..0d900fb40d 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmStandbyButtonDispatch/SmmStandbyButtonDispatch.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmStandbyButtonDispatch/SmmStandbyButtonDispatch.h
@@ -143,10 +143,10 @@ EFI_STATUS
 //

 // Interface structure for the SMM Standby Button SMI Dispatch Protocol

 //

-typedef struct _EFI_SMM_STANDBY_BUTTON_DISPATCH_PROTOCOL {

+struct _EFI_SMM_STANDBY_BUTTON_DISPATCH_PROTOCOL {

   EFI_SMM_STANDBY_BUTTON_REGISTER   Register;

   EFI_SMM_STANDBY_BUTTON_UNREGISTER UnRegister;

-} EFI_SMM_STANDBY_BUTTON_DISPATCH_PROTOCOL;

+};

 

 extern EFI_GUID gEfiSmmStandbyButtonDispatchProtocolGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmStatusCode/SmmStatusCode.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmStatusCode/SmmStatusCode.h
index ef9a08918c..24f65f2e6c 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmStatusCode/SmmStatusCode.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmStatusCode/SmmStatusCode.h
@@ -51,8 +51,8 @@ EFI_STATUS
   IN EFI_STATUS_CODE_DATA         * Data OPTIONAL

   );

 

-typedef struct _EFI_SMM_STATUS_CODE_PROTOCOL {

+struct _EFI_SMM_STATUS_CODE_PROTOCOL {

   EFI_SMM_REPORT_STATUS_CODE  ReportStatusCode;

-} EFI_SMM_STATUS_CODE_PROTOCOL;

+};

 

 #endif

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmSwDispatch/SmmSwDispatch.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmSwDispatch/SmmSwDispatch.h
index 765d1baa29..a47c04a46b 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmSwDispatch/SmmSwDispatch.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmSwDispatch/SmmSwDispatch.h
@@ -140,11 +140,11 @@ EFI_STATUS
 //

 // Interface structure for the SMM Software SMI Dispatch Protocol

 //

-typedef struct _EFI_SMM_SW_DISPATCH_PROTOCOL {

+struct _EFI_SMM_SW_DISPATCH_PROTOCOL {

   EFI_SMM_SW_REGISTER   Register;

   EFI_SMM_SW_UNREGISTER UnRegister;

   UINTN                 MaximumSwiValue;

-} EFI_SMM_SW_DISPATCH_PROTOCOL;

+};

 

 extern EFI_GUID gEfiSmmSwDispatchProtocolGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmSxDispatch/SmmSxDispatch.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmSxDispatch/SmmSxDispatch.h
index e80272f7f2..ba44556db4 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmSxDispatch/SmmSxDispatch.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmSxDispatch/SmmSxDispatch.h
@@ -160,10 +160,10 @@ EFI_STATUS
 //

 // Interface structure for the SMM Child Dispatch Protocol

 //

-typedef struct _EFI_SMM_SX_DISPATCH_PROTOCOL {

+struct _EFI_SMM_SX_DISPATCH_PROTOCOL {

   EFI_SMM_SX_REGISTER   Register;

   EFI_SMM_SX_UNREGISTER UnRegister;

-} EFI_SMM_SX_DISPATCH_PROTOCOL;

+};

 

 extern EFI_GUID gEfiSmmSxDispatchProtocolGuid;

 

diff --git a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmUsbDispatch/SmmUsbDispatch.h b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmUsbDispatch/SmmUsbDispatch.h
index 386aad23bc..902e0fd135 100644
--- a/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmUsbDispatch/SmmUsbDispatch.h
+++ b/EdkCompatibilityPkg/Foundation/Framework/Protocol/SmmUsbDispatch/SmmUsbDispatch.h
@@ -139,10 +139,10 @@ EFI_STATUS
 //

 // Interface structure for the SMM USB SMI Dispatch Protocol

 //

-typedef struct _EFI_SMM_USB_DISPATCH_PROTOCOL {

+struct _EFI_SMM_USB_DISPATCH_PROTOCOL {

   EFI_SMM_USB_REGISTER    Register;

   EFI_SMM_USB_UNREGISTER  UnRegister;

-} EFI_SMM_USB_DISPATCH_PROTOCOL;

+};

 

 extern EFI_GUID gEfiSmmUsbDispatchProtocolGuid;