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

edk2/EdkCompatibilityPkg/Foundation/Framework/Ppi/Reset/Reset.h:
* Changed name of colliding function pointer typedef.


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

EdkCompatibilityPkg/Foundation/Framework/Ppi/BlockIo/BlockIo.h

@@ -77,11 +77,11 @@ EFI_STATUS
   OUT VOID                                     *Buffer
   );
 
-typedef struct _PEI_RECOVERY_BLOCK_IO_INTERFACE {
+struct _PEI_RECOVERY_BLOCK_IO_INTERFACE {
   PEI_GET_NUMBER_BLOCK_DEVICES      GetNumberOfBlockDevices;
   PEI_GET_DEVICE_MEDIA_INFORMATION  GetBlockDeviceMediaInfo;
   PEI_READ_BLOCKS                   ReadBlocks;
-} PEI_RECOVERY_BLOCK_IO_INTERFACE;
+};
 
 extern EFI_GUID gPeiBlockIoPpiGuid;
 

EdkCompatibilityPkg/Foundation/Framework/Ppi/BootScriptExecuter/BootScriptExecuter.h

@@ -40,10 +40,10 @@ EFI_STATUS
   IN     EFI_GUID                                * FvFile OPTIONAL
   );
 
-typedef struct _PEI_BOOT_SCRIPT_EXECUTER_PPI {
+struct _PEI_BOOT_SCRIPT_EXECUTER_PPI {
   UINT64                  Revision;
   PEI_BOOT_SCRIPT_EXECUTE Execute;
-} PEI_BOOT_SCRIPT_EXECUTER_PPI;
+};
 
 extern EFI_GUID gPeiBootScriptExecuterPpiGuid;
 

EdkCompatibilityPkg/Foundation/Framework/Ppi/CpuIo/CpuIo.h

@@ -224,7 +224,7 @@ VOID
 // PEI_CPU_IO_PPI
 // *******************************************************
 //
-typedef struct _PEI_CPU_IO_PPI {
+struct _PEI_CPU_IO_PPI {
   PEI_CPU_IO_PPI_ACCESS       Mem;
   PEI_CPU_IO_PPI_ACCESS       Io;
   PEI_CPU_IO_PPI_IO_READ8     IoRead8;
@@ -243,7 +243,7 @@ typedef struct _PEI_CPU_IO_PPI {
   PEI_CPU_IO_PPI_MEM_WRITE16  MemWrite16;
   PEI_CPU_IO_PPI_MEM_WRITE32  MemWrite32;
   PEI_CPU_IO_PPI_MEM_WRITE64  MemWrite64;
-} PEI_CPU_IO_PPI;
+};
 
 extern EFI_GUID gPeiCpuIoPpiInServiceTableGuid;
 

EdkCompatibilityPkg/Foundation/Framework/Ppi/Decompress/Decompress.h

@@ -38,9 +38,9 @@ EFI_STATUS
   OUT UINTN                                  *OutputSize
   );
 
-typedef struct _EFI_PEI_DECOMPRESS_PPI {
+struct _EFI_PEI_DECOMPRESS_PPI {
   EFI_PEI_DECOMPRESS_DECOMPRESS   Decompress;
-} EFI_PEI_DECOMPRESS_PPI;
+};
 
 
 

EdkCompatibilityPkg/Foundation/Framework/Ppi/DeviceRecoveryModule/DeviceRecoveryModule.h

@@ -57,11 +57,11 @@ EFI_STATUS
   OUT VOID                                        *Buffer
   );
 
-typedef struct _PEI_DEVICE_RECOVERY_MODULE_INTERFACE {
+struct _PEI_DEVICE_RECOVERY_MODULE_INTERFACE {
   PEI_DEVICE_GET_NUMBER_RECOVERY_CAPSULE  GetNumberRecoveryCapsules;
   PEI_DEVICE_GET_RECOVERY_CAPSULE_INFO    GetRecoveryCapsuleInfo;
   PEI_DEVICE_LOAD_RECOVERY_CAPSULE        LoadRecoveryCapsule;
-} PEI_DEVICE_RECOVERY_MODULE_INTERFACE;
+};
 
 extern EFI_GUID gPeiDeviceRecoveryModulePpiGuid;
 

EdkCompatibilityPkg/Foundation/Framework/Ppi/DxeIpl/DxeIpl.h

@@ -42,9 +42,9 @@ EFI_STATUS
   IN EFI_PEI_HOB_POINTERS         HobList
   );
 
-typedef struct _EFI_DXE_IPL_PPI {
+struct _EFI_DXE_IPL_PPI {
   EFI_DXE_IPL_ENTRY Entry;
-} EFI_DXE_IPL_PPI;
+};
 
 extern EFI_GUID gEfiDxeIplPpiGuid;
 

EdkCompatibilityPkg/Foundation/Framework/Ppi/FindFv/FindFv.h

@@ -42,9 +42,9 @@ EFI_STATUS
   EFI_FIRMWARE_VOLUME_HEADER  **FVAddress
   );
 
-typedef struct _EFI_FIND_FV_PPI {
+struct _EFI_FIND_FV_PPI {
   EFI_FIND_FV_FINDFV  FindFv;
-} EFI_FIND_FV_PPI;
+};
 
 extern EFI_GUID gEfiFindFvPpiGuid;
 

EdkCompatibilityPkg/Foundation/Framework/Ppi/FirmwareVolume/FirmwareVolume.h

@@ -100,13 +100,13 @@ EFI_STATUS
   OUT VOID                               **SectionData
   );
 
-typedef struct _EFI_PEI_FIRMWARE_VOLUME_PPI {
+struct _EFI_PEI_FIRMWARE_VOLUME_PPI {
   EFI_PEI_FV_PROCESS_FV             ProcessVolume;
   EFI_PEI_FV_FIND_FILE_TYPE         FindFileByType;   
   EFI_PEI_FV_FIND_FILE_NAME         FindFileByName;     
   EFI_PEI_FV_GET_FILE_INFO          GetFileInfo;      
   EFI_PEI_FV_GET_INFO               GetVolumeInfo;
   EFI_PEI_FV_FIND_SECTION           FindSectionByType;
-} EFI_PEI_FIRMWARE_VOLUME_PPI;
+};
 
 #endif

EdkCompatibilityPkg/Foundation/Framework/Ppi/FirmwareVolumeInfo/FirmwareVolumeInfo.h

@@ -32,13 +32,13 @@ EFI_FORWARD_DECLARATION (EFI_PEI_FIRMWARE_VOLUME_INFO_PPI);
   { 0x49edb1c1, 0xbf21, 0x4761, { 0xbb, 0x12, 0xeb, 0x0, 0x31, 0xaa, 0xbb, 0x39 } }
 
 
-typedef struct _EFI_PEI_FIRMWARE_VOLUME_INFO_PPI {
+struct _EFI_PEI_FIRMWARE_VOLUME_INFO_PPI {
   EFI_GUID            FvFormat;
   VOID                *FvInfo;
   UINT32              FvInfoSize;
   EFI_GUID            *ParentFvName;
   EFI_GUID            *ParentFileName;
-} EFI_PEI_FIRMWARE_VOLUME_INFO_PPI;
+};
 
 
 extern EFI_GUID gEfiFirmwareVolumeInfoPpiGuid;

EdkCompatibilityPkg/Foundation/Framework/Ppi/GuidedSectionExtraction/GuidedSectionExtraction.h

@@ -35,8 +35,8 @@ EFI_STATUS
   OUT UINT32                                      *AuthenticationStatus
   );
 
-typedef struct _EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI {
+struct _EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI {
   EFI_PEI_EXTRACT_GUIDED_SECTION  ExtractSection;
-} EFI_PEI_GUIDED_SECTION_EXTRACTION_PPI;
+};
 
 #endif

EdkCompatibilityPkg/Foundation/Framework/Ppi/LoadFile/LoadFile.h

@@ -39,9 +39,9 @@ EFI_STATUS
   OUT EFI_PHYSICAL_ADDRESS                      * EntryPoint
   );
 
-typedef struct _EFI_PEI_FV_FILE_LOADER_PPI {
+struct _EFI_PEI_FV_FILE_LOADER_PPI {
   EFI_PEI_FV_LOAD_FILE  FvLoadFile;
-} EFI_PEI_FV_FILE_LOADER_PPI;
+};
 
 extern EFI_GUID gPeiFvFileLoaderPpiGuid;
 

EdkCompatibilityPkg/Foundation/Framework/Ppi/LoadFile2/LoadFile2.h

@@ -40,9 +40,9 @@ EFI_STATUS
   );
 
 
-typedef struct _EFI_PEI_LOAD_FILE_PPI {
+struct _EFI_PEI_LOAD_FILE_PPI {
   EFI_PEI_LOAD_FILE LoadFile;
-} EFI_PEI_LOAD_FILE_PPI;
+};
 
 
 extern EFI_GUID gEfiLoadFile2PpiGuid;

EdkCompatibilityPkg/Foundation/Framework/Ppi/PciCfg/PciCfg.h

@@ -54,11 +54,11 @@ EFI_STATUS
   IN UINTN                    ClearBits
   );
 
-typedef struct _PEI_PCI_CFG_PPI {
+struct _PEI_PCI_CFG_PPI {
   PEI_PCI_CFG_PPI_IO  Read;
   PEI_PCI_CFG_PPI_IO  Write;
   PEI_PCI_CFG_PPI_RW  Modify;
-} PEI_PCI_CFG_PPI;
+};
 
 extern EFI_GUID gPeiPciCfgPpiInServiceTableGuid;
 

EdkCompatibilityPkg/Foundation/Framework/Ppi/PciCfg2/PciCfg2.h

@@ -54,12 +54,12 @@ EFI_STATUS
   IN VOID                           *ClearBits
   );
 
-typedef struct _EFI_PEI_PCI_CFG2_PPI {
+struct _EFI_PEI_PCI_CFG2_PPI {
   EFI_PEI_PCI_CFG_PPI_IO  Read;
   EFI_PEI_PCI_CFG_PPI_IO  Write;
   EFI_PEI_PCI_CFG_PPI_RW  Modify;
   UINT16                  Segment;
-} EFI_PEI_PCI_CFG2_PPI;
+};
 
 extern EFI_GUID gPeiPciCfg2PpiGuid;
 

EdkCompatibilityPkg/Foundation/Framework/Ppi/RecoveryModule/RecoveryModule.h

@@ -36,9 +36,9 @@ EFI_STATUS
   IN PEI_RECOVERY_MODULE_INTERFACE          * This
   );
 
-typedef struct _PEI_RECOVERY_MODULE_INTERFACE {
+struct _PEI_RECOVERY_MODULE_INTERFACE {
   PEI_LOAD_RECOVERY_CAPSULE LoadRecoveryCapsule;
-} PEI_RECOVERY_MODULE_INTERFACE;
+};
 
 extern EFI_GUID gPeiRecoveryModulePpiGuid;
 

EdkCompatibilityPkg/Foundation/Framework/Ppi/Reset/Reset.h

@@ -41,12 +41,12 @@ typedef enum {
 
 typedef
 EFI_STATUS
-(EFIAPI *EFI_PEI_RESET_SYSTEM) (
+(EFIAPI *PEI_RESET_PPI_RESET_SYSTEM) (
   IN EFI_PEI_SERVICES   **PeiServices
   );
 
 typedef struct {
-  EFI_PEI_RESET_SYSTEM  ResetSystem;
+  PEI_RESET_PPI_RESET_SYSTEM  ResetSystem;
 } PEI_RESET_PPI;
 
 extern EFI_GUID gPeiResetPpiGuid;

EdkCompatibilityPkg/Foundation/Framework/Ppi/S3Resume/S3Resume.h

@@ -35,9 +35,9 @@ EFI_STATUS
   IN EFI_PEI_SERVICES   **PeiServices
   );
 
-typedef struct _PEI_S3_RESUME_PPI {
+struct _PEI_S3_RESUME_PPI {
   PEI_S3_RESUME_PPI_RESTORE_CONFIG  S3RestoreConfig;
-} PEI_S3_RESUME_PPI;
+};
 
 extern EFI_GUID gPeiS3ResumePpiGuid;
 

EdkCompatibilityPkg/Foundation/Framework/Ppi/SecPlatformInformation/SecPlatformInformation.h

@@ -64,8 +64,8 @@ EFI_STATUS
   IN OUT SEC_PLATFORM_INFORMATION_RECORD *PlatformInformationRecord
   );
 
-typedef struct _EFI_SEC_PLATFORM_INFORMATION_PPI {
+struct _EFI_SEC_PLATFORM_INFORMATION_PPI {
   SEC_PLATFORM_INFORMATION  PlatformInformation;
-} EFI_SEC_PLATFORM_INFORMATION_PPI;
+};
 
 #endif

EdkCompatibilityPkg/Foundation/Framework/Ppi/SectionExtraction/SectionExtraction.h

@@ -50,9 +50,9 @@ EFI_STATUS
 #define EFI_PEI_AUTH_STATUS_NOT_TESTED        0x04
 #define EFI_PEI_AUTH_STATUS_TEST_FAILED       0x08
 
-typedef struct _EFI_PEI_SECTION_EXTRACTION_PPI {
+struct _EFI_PEI_SECTION_EXTRACTION_PPI {
   EFI_PEI_GET_SECTION PeiGetSection;
-} EFI_PEI_SECTION_EXTRACTION_PPI;
+};
 
 extern EFI_GUID gPeiSectionExtractionPpiGuid;
 

EdkCompatibilityPkg/Foundation/Framework/Ppi/Security/Security.h

@@ -39,9 +39,9 @@ EFI_STATUS
   IN OUT BOOLEAN                  *StartCrisisRecovery
   );
 
-typedef struct _PEI_SECURITY_PPI {
+struct _PEI_SECURITY_PPI {
   PEI_SECURITY_AUTHENTICATION_STATE AuthenticationState;
-} PEI_SECURITY_PPI;
+};
 
 extern EFI_GUID gPeiSecurityPpiGuid;
 

EdkCompatibilityPkg/Foundation/Framework/Ppi/Security2/Security2.h

@@ -40,9 +40,9 @@ EFI_STATUS
   IN OUT BOOLEAN                  *DeferExection
   );
 
-typedef struct _EFI_PEI_SECURITY2_PPI {
+struct _EFI_PEI_SECURITY2_PPI {
   EFI_PEI_SECURITY_AUTHENTICATION_STATE  AuthenticationState;
-} EFI_PEI_SECURITY2_PPI;
+};
 
 
 extern EFI_GUID gEfiPeiSecurity2PpiGuid;

EdkCompatibilityPkg/Foundation/Framework/Ppi/Smbus/Smbus.h

@@ -89,12 +89,12 @@ EFI_STATUS
   IN      PEI_SMBUS_NOTIFY_FUNCTION NotifyFunction
   );
 
-typedef struct _PEI_SMBUS_PPI {
+struct _PEI_SMBUS_PPI {
   PEI_SMBUS_PPI_EXECUTE_OPERATION Execute;
   PEI_SMBUS_PPI_ARP_DEVICE        ArpDevice;
   PEI_SMBUS_PPI_GET_ARP_MAP       GetArpMap;
   PEI_SMBUS_PPI_NOTIFY            Notify;
-} PEI_SMBUS_PPI;
+};
 
 extern EFI_GUID gPeiSmbusPpiGuid;
 

EdkCompatibilityPkg/Foundation/Framework/Ppi/Smbus2/Smbus2.h

@@ -83,13 +83,13 @@ EFI_STATUS
   IN      EFI_PEI_SMBUS_NOTIFY2_FUNCTION NotifyFunction
   );
 
-typedef struct _EFI_PEI_SMBUS2_PPI {
+struct _EFI_PEI_SMBUS2_PPI {
   EFI_PEI_SMBUS2_PPI_EXECUTE_OPERATION Execute;
   EFI_PEI_SMBUS2_PPI_ARP_DEVICE        ArpDevice;
   EFI_PEI_SMBUS2_PPI_GET_ARP_MAP       GetArpMap;
   EFI_PEI_SMBUS2_PPI_NOTIFY            Notify;
   EFI_GUID                             Identifier;
-} EFI_PEI_SMBUS2_PPI;
+};
 
 extern EFI_GUID gPeiSmbus2PpiGuid;
 

EdkCompatibilityPkg/Foundation/Framework/Ppi/Stall/Stall.h

@@ -37,10 +37,10 @@ EFI_STATUS
   IN UINTN                      Microseconds
   );
 
-typedef struct _PEI_STALL_PPI {
+struct _PEI_STALL_PPI {
   UINTN     Resolution;
   PEI_STALL Stall;
-} PEI_STALL_PPI;
+};
 
 extern EFI_GUID gPeiStallPpiGuid;
 

EdkCompatibilityPkg/Foundation/Framework/Ppi/StatusCode/StatusCode.h

@@ -40,9 +40,9 @@ EFI_STATUS
   IN EFI_STATUS_CODE_DATA            * Data OPTIONAL
   );
 
-typedef struct _PEI_STATUS_CODE_PPI {
+struct _PEI_STATUS_CODE_PPI {
   PEI_REPORT_STATUS_CODE  ReportStatusCode;
-} PEI_STATUS_CODE_PPI;
+};
 
 extern EFI_GUID gPeiStatusCodePpiGuid;
 

EdkCompatibilityPkg/Foundation/Framework/Ppi/Variable2/Variable2.h

@@ -51,10 +51,10 @@ EFI_STATUS
   IN OUT EFI_GUID                             *VariableGuid
   );
 
-typedef struct _EFI_PEI_READ_ONLY_VARIABLE2_PPI {
+struct _EFI_PEI_READ_ONLY_VARIABLE2_PPI {
   EFI_PEI_GET_VARIABLE2            GetVariable;
   EFI_PEI_GET_NEXT_VARIABLE_NAME2  GetNextVariableName;
-} EFI_PEI_READ_ONLY_VARIABLE2_PPI;
+};
 
 extern EFI_GUID gPeiReadOnlyVariable2PpiGuid;