From e5bce2758f79f8b1d5a5466d48ff482b1b06670e Mon Sep 17 00:00:00 2001 From: jljusten Date: Thu, 20 Mar 2008 16:37:48 +0000 Subject: [PATCH] Removed extra typedefs on structures to remove error with gcc compiler. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4928 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Efi/Protocol/AbsolutePointer/AbsolutePointer.h | 4 ++-- .../Foundation/Efi/Protocol/AcpiTable/AcpiTable.h | 4 ++-- EdkCompatibilityPkg/Foundation/Efi/Protocol/Arp/Arp.h | 8 ++++---- EdkCompatibilityPkg/Foundation/Efi/Protocol/Bis/Bis.h | 4 ++-- .../Foundation/Efi/Protocol/BlockIo/BlockIo.h | 4 ++-- .../BusSpecificDriverOverride.h | 4 ++-- .../Efi/Protocol/ComponentName/ComponentName.h | 4 ++-- .../Efi/Protocol/ComponentName2/ComponentName2.h | 4 ++-- .../Foundation/Efi/Protocol/DebugPort/DebugPort.h | 4 ++-- .../Foundation/Efi/Protocol/DebugSupport/DebugSupport.h | 4 ++-- .../Foundation/Efi/Protocol/Decompress/Decompress.h | 4 ++-- .../Foundation/Efi/Protocol/DeviceIo/DeviceIo.h | 4 ++-- .../Foundation/Efi/Protocol/Dhcp4/Dhcp4.h | 4 ++-- .../Foundation/Efi/Protocol/DiskIo/DiskIo.h | 4 ++-- .../Efi/Protocol/DriverBinding/DriverBinding.h | 4 ++-- .../Protocol/DriverConfiguration/DriverConfiguration.h | 4 ++-- .../Efi/Protocol/DriverDiagnostics/DriverDiagnostics.h | 4 ++-- EdkCompatibilityPkg/Foundation/Efi/Protocol/Ebc/Ebc.h | 4 ++-- .../Foundation/Efi/Protocol/EdidOverride/EdidOverride.h | 4 ++-- .../EfiNetworkInterfaceIdentifier.h | 4 ++-- .../Foundation/Efi/Protocol/FormBrowser2/FormBrowser2.h | 6 ++---- .../Efi/Protocol/GraphicsOutput/GraphicsOutput.h | 4 ++-- .../Efi/Protocol/HiiConfigAccess/HiiConfigAccess.h | 4 ++-- .../Efi/Protocol/HiiConfigRouting/HiiConfigRouting.h | 4 ++-- .../Foundation/Efi/Protocol/HiiDatabase/HiiDatabase.h | 4 ++-- .../Foundation/Efi/Protocol/HiiFont/HiiFont.h | 4 ++-- .../Foundation/Efi/Protocol/HiiImage/HiiImage.h | 4 ++-- .../Foundation/Efi/Protocol/HiiString/HiiString.h | 4 ++-- EdkCompatibilityPkg/Foundation/Efi/Protocol/Ip4/Ip4.h | 4 ++-- .../Foundation/Efi/Protocol/Ip4Config/Ip4Config.h | 4 ++-- .../Foundation/Efi/Protocol/LoadFile/LoadFile.h | 4 ++-- .../Efi/Protocol/ManagedNetwork/ManagedNetwork.h | 4 ++-- .../Foundation/Efi/Protocol/Mtftp4/Mtftp4.h | 8 ++++---- .../Foundation/Efi/Protocol/PciIo/PciIo.h | 4 ++-- .../Efi/Protocol/PciRootBridgeIo/PciRootBridgeIo.h | 4 ++-- .../PlatformDriverOverride/PlatformDriverOverride.h | 4 ++-- .../Foundation/Efi/Protocol/PxeBaseCode/PxeBaseCode.h | 4 ++-- .../Protocol/PxeBaseCodeCallBack/PxeBaseCodeCallBack.h | 4 ++-- .../Foundation/Efi/Protocol/ScsiPassThru/ScsiPassThru.h | 4 ++-- .../Foundation/Efi/Protocol/SerialIo/SerialIo.h | 4 ++-- .../Efi/Protocol/ServiceBinding/ServiceBinding.h | 4 ++-- .../Efi/Protocol/SimpleFileSystem/SimpleFileSystem.h | 9 ++++----- .../Efi/Protocol/SimpleNetwork/SimpleNetwork.h | 4 ++-- .../Efi/Protocol/SimplePointer/SimplePointer.h | 4 ++-- .../Foundation/Efi/Protocol/SimpleTextIn/SimpleTextIn.h | 4 ++-- .../Efi/Protocol/SimpleTextInputEx/SimpleTextInputEx.h | 4 ++-- .../Efi/Protocol/SimpleTextOut/SimpleTextOut.h | 4 ++-- EdkCompatibilityPkg/Foundation/Efi/Protocol/Tcp4/Tcp4.h | 4 ++-- EdkCompatibilityPkg/Foundation/Efi/Protocol/Udp4/Udp4.h | 4 ++-- .../Foundation/Efi/Protocol/UgaDraw/UgaDraw.h | 4 ++-- .../Foundation/Efi/Protocol/UgaIo/UgaIo.h | 4 ++-- .../Efi/Protocol/UnicodeCollation/UnicodeCollation.h | 4 ++-- .../Efi/Protocol/UsbHostController/UsbHostController.h | 8 ++++---- .../Foundation/Efi/Protocol/UsbIo/UsbIo.h | 4 ++-- 54 files changed, 116 insertions(+), 119 deletions(-) diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/AbsolutePointer/AbsolutePointer.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/AbsolutePointer/AbsolutePointer.h index 7f5e0c4a82..5f73163bde 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/AbsolutePointer/AbsolutePointer.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/AbsolutePointer/AbsolutePointer.h @@ -105,12 +105,12 @@ EFI_STATUS --*/ ; -typedef struct _EFI_ABSOLUTE_POINTER_PROTOCOL { +struct _EFI_ABSOLUTE_POINTER_PROTOCOL { EFI_ABSOLUTE_POINTER_RESET Reset; EFI_ABSOLUTE_POINTER_GET_STATE GetState; EFI_EVENT WaitForInput; EFI_ABSOLUTE_POINTER_MODE *Mode; -} EFI_ABSOLUTE_POINTER_PROTOCOL; +}; extern EFI_GUID gEfiAbsolutePointerProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/AcpiTable/AcpiTable.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/AcpiTable/AcpiTable.h index 2b7d27fd1a..0464369cf4 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/AcpiTable/AcpiTable.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/AcpiTable/AcpiTable.h @@ -102,10 +102,10 @@ EFI_STATUS // // Interface structure for the ACPI Table Protocol // -typedef struct _EFI_ACPI_TABLE_PROTOCOL { +struct _EFI_ACPI_TABLE_PROTOCOL { EFI_ACPI_TABLE_INSTALL_ACPI_TABLE InstallAcpiTable; EFI_ACPI_TABLE_UNINSTALL_ACPI_TABLE UninstallAcpiTable; -} EFI_ACPI_TABLE_PROTOCOL; +}; extern EFI_GUID gEfiAcpiTableProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Arp/Arp.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Arp/Arp.h index 2a7e81f3c5..a234b4ae60 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Arp/Arp.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Arp/Arp.h @@ -32,7 +32,7 @@ Abstract: EFI_FORWARD_DECLARATION (EFI_ARP_PROTOCOL); -typedef struct _EFI_ARP_FIND_DATA { +struct _EFI_ARP_FIND_DATA { UINT32 Size; BOOLEAN DenyFlag; BOOLEAN StaticFlag; @@ -40,7 +40,7 @@ UINT16 HwAddressType; UINT16 SwAddressType; UINT8 HwAddressLength; UINT8 SwAddressLength; -} EFI_ARP_FIND_DATA; +}; //**************************************************** @@ -119,7 +119,7 @@ IN VOID *TargetSwAddress OPTIONAL, IN EFI_EVENT ResolvedEvent OPTIONAL ); -typedef struct _EFI_ARP_PROTOCOL { +struct _EFI_ARP_PROTOCOL { EFI_ARP_CONFIGURE Configure; EFI_ARP_ADD Add; EFI_ARP_FIND Find; @@ -127,7 +127,7 @@ typedef struct _EFI_ARP_PROTOCOL { EFI_ARP_FLUSH Flush; EFI_ARP_REQUEST Request; EFI_ARP_CANCEL Cancel; -} EFI_ARP_PROTOCOL; +}; extern EFI_GUID gEfiArpServiceBindingProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Bis/Bis.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Bis/Bis.h index 71d5fb3b10..21d4908fc3 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Bis/Bis.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Bis/Bis.h @@ -207,7 +207,7 @@ EFI_STATUS #define EFI_BIS_PROTOCOL_REVISION 0x00010000 -typedef struct _EFI_BIS_PROTOCOL { +struct _EFI_BIS_PROTOCOL { // // member vars // @@ -226,7 +226,7 @@ typedef struct _EFI_BIS_PROTOCOL { EFI_BIS_UPDATE_BOOT_OBJECT_AUTHORIZATION UpdateBootObjectAuthorization; EFI_BIS_VERIFY_BOOT_OBJECT VerifyBootObject; EFI_BIS_VERIFY_OBJECT_WITH_CREDENTIAL VerifyObjectWithCredential; -} EFI_BIS_PROTOCOL; +}; extern EFI_GUID gEfiBisProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/BlockIo/BlockIo.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/BlockIo/BlockIo.h index 740b58d64c..8d644f1765 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/BlockIo/BlockIo.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/BlockIo/BlockIo.h @@ -189,7 +189,7 @@ typedef struct { #define EFI_BLOCK_IO_PROTOCOL_REVISION 0x00010000 -typedef struct _EFI_BLOCK_IO_PROTOCOL { +struct _EFI_BLOCK_IO_PROTOCOL { UINT64 Revision; EFI_BLOCK_IO_MEDIA *Media; @@ -199,7 +199,7 @@ typedef struct _EFI_BLOCK_IO_PROTOCOL { EFI_BLOCK_WRITE WriteBlocks; EFI_BLOCK_FLUSH FlushBlocks; -} EFI_BLOCK_IO_PROTOCOL; +}; extern EFI_GUID gEfiBlockIoProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/BusSpecificDriverOverride/BusSpecificDriverOverride.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/BusSpecificDriverOverride/BusSpecificDriverOverride.h index ad7eade50a..9409874a43 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/BusSpecificDriverOverride/BusSpecificDriverOverride.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/BusSpecificDriverOverride/BusSpecificDriverOverride.h @@ -45,9 +45,9 @@ EFI_STATUS // // Interface structure for the Bus Specific Driver Override Protocol // -typedef struct _EFI_BUS_SPECIFIC_DRIVER_OVERRIDE_PROTOCOL { +struct _EFI_BUS_SPECIFIC_DRIVER_OVERRIDE_PROTOCOL { EFI_BUS_SPECIFIC_DRIVER_OVERRIDE_GET_DRIVER GetDriver; -} EFI_BUS_SPECIFIC_DRIVER_OVERRIDE_PROTOCOL; +}; extern EFI_GUID gEfiBusSpecificDriverOverrideProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/ComponentName/ComponentName.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/ComponentName/ComponentName.h index 984252394b..4e19ff5c0a 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/ComponentName/ComponentName.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/ComponentName/ComponentName.h @@ -126,11 +126,11 @@ EFI_STATUS // // Interface structure for the Component Name Protocol // -typedef struct _EFI_COMPONENT_NAME_PROTOCOL { +struct _EFI_COMPONENT_NAME_PROTOCOL { EFI_COMPONENT_NAME_GET_DRIVER_NAME GetDriverName; EFI_COMPONENT_NAME_GET_CONTROLLER_NAME GetControllerName; CHAR8 *SupportedLanguages; -} EFI_COMPONENT_NAME_PROTOCOL; +}; extern EFI_GUID gEfiComponentNameProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/ComponentName2/ComponentName2.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/ComponentName2/ComponentName2.h index 4f6bb35b02..6861ac19c0 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/ComponentName2/ComponentName2.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/ComponentName2/ComponentName2.h @@ -125,11 +125,11 @@ EFI_STATUS // // Interface structure for the Component Name Protocol // -typedef struct _EFI_COMPONENT_NAME2_PROTOCOL { +struct _EFI_COMPONENT_NAME2_PROTOCOL { EFI_COMPONENT_NAME2_GET_DRIVER_NAME GetDriverName; EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME GetControllerName; CHAR8 *SupportedLanguages; -} EFI_COMPONENT_NAME2_PROTOCOL; +}; extern EFI_GUID gEfiComponentName2ProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugPort/DebugPort.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugPort/DebugPort.h index af80b751fc..87f78cbfab 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugPort/DebugPort.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugPort/DebugPort.h @@ -70,12 +70,12 @@ EFI_STATUS // // DebugPort protocol definition // -typedef struct _EFI_DEBUGPORT_PROTOCOL { +struct _EFI_DEBUGPORT_PROTOCOL { EFI_DEBUGPORT_RESET Reset; EFI_DEBUGPORT_WRITE Write; EFI_DEBUGPORT_READ Read; EFI_DEBUGPORT_POLL Poll; -} EFI_DEBUGPORT_PROTOCOL; +}; // // DEBUGPORT variable definitions... diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugSupport/DebugSupport.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugSupport/DebugSupport.h index d5ed15f232..5c08d5a0ce 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugSupport/DebugSupport.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DebugSupport/DebugSupport.h @@ -581,13 +581,13 @@ EFI_STATUS // // DebugSupport protocol definition // -typedef struct _EFI_DEBUG_SUPPORT_PROTOCOL { +struct _EFI_DEBUG_SUPPORT_PROTOCOL { EFI_INSTRUCTION_SET_ARCHITECTURE Isa; EFI_GET_MAXIMUM_PROCESSOR_INDEX GetMaximumProcessorIndex; EFI_REGISTER_PERIODIC_CALLBACK RegisterPeriodicCallback; EFI_REGISTER_EXCEPTION_CALLBACK RegisterExceptionCallback; EFI_INVALIDATE_INSTRUCTION_CACHE InvalidateInstructionCache; -} EFI_DEBUG_SUPPORT_PROTOCOL; +}; extern EFI_GUID gEfiDebugSupportProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Decompress/Decompress.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Decompress/Decompress.h index 93839a7898..88a50ab67a 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Decompress/Decompress.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Decompress/Decompress.h @@ -130,10 +130,10 @@ Returns: corrupted (not in a valid compressed format). --*/ -typedef struct _EFI_DECOMPRESS_PROTOCOL { +struct _EFI_DECOMPRESS_PROTOCOL { EFI_DECOMPRESS_GET_INFO GetInfo; EFI_DECOMPRESS_DECOMPRESS Decompress; -} EFI_DECOMPRESS_PROTOCOL; +}; extern EFI_GUID gEfiDecompressProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DeviceIo/DeviceIo.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DeviceIo/DeviceIo.h index d0f4678a50..270e0a46ef 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DeviceIo/DeviceIo.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DeviceIo/DeviceIo.h @@ -115,7 +115,7 @@ EFI_STATUS IN EFI_PHYSICAL_ADDRESS HostAddress ); -typedef struct _EFI_DEVICE_IO_PROTOCOL { +struct _EFI_DEVICE_IO_PROTOCOL { EFI_IO_ACCESS Mem; EFI_IO_ACCESS Io; EFI_IO_ACCESS Pci; @@ -125,7 +125,7 @@ typedef struct _EFI_DEVICE_IO_PROTOCOL { EFI_IO_ALLOCATE_BUFFER AllocateBuffer; EFI_IO_FLUSH Flush; EFI_IO_FREE_BUFFER FreeBuffer; -} EFI_DEVICE_IO_PROTOCOL; +}; extern EFI_GUID gEfiDeviceIoProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Dhcp4/Dhcp4.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Dhcp4/Dhcp4.h index a0205caf55..d6ad0fff2e 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Dhcp4/Dhcp4.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Dhcp4/Dhcp4.h @@ -220,7 +220,7 @@ EFI_STATUS OUT EFI_DHCP4_PACKET_OPTION *PacketOptionList[] OPTIONAL ); -typedef struct _EFI_DHCP4_PROTOCOL { +struct _EFI_DHCP4_PROTOCOL { EFI_DHCP4_GET_MODE_DATA GetModeData; EFI_DHCP4_CONFIGURE Configure; EFI_DHCP4_START Start; @@ -230,6 +230,6 @@ typedef struct _EFI_DHCP4_PROTOCOL { EFI_DHCP4_BUILD Build; EFI_DHCP4_TRANSMIT_RECEIVE TransmitReceive; EFI_DHCP4_PARSE Parse; -} EFI_DHCP4_PROTOCOL; +}; #endif diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DiskIo/DiskIo.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DiskIo/DiskIo.h index fee3034fc8..cb703bac4b 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DiskIo/DiskIo.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DiskIo/DiskIo.h @@ -100,11 +100,11 @@ EFI_STATUS #define EFI_DISK_IO_PROTOCOL_REVISION 0x00010000 -typedef struct _EFI_DISK_IO_PROTOCOL { +struct _EFI_DISK_IO_PROTOCOL { UINT64 Revision; EFI_DISK_READ ReadDisk; EFI_DISK_WRITE WriteDisk; -} EFI_DISK_IO_PROTOCOL; +}; extern EFI_GUID gEfiDiskIoProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverBinding/DriverBinding.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverBinding/DriverBinding.h index 2f30df64a3..638363c347 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverBinding/DriverBinding.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverBinding/DriverBinding.h @@ -116,14 +116,14 @@ EFI_STATUS // // Interface structure for the ControllerHandle Driver Protocol // -typedef struct _EFI_DRIVER_BINDING_PROTOCOL { +struct _EFI_DRIVER_BINDING_PROTOCOL { EFI_DRIVER_BINDING_SUPPORTED Supported; EFI_DRIVER_BINDING_START Start; EFI_DRIVER_BINDING_STOP Stop; UINT32 Version; EFI_HANDLE ImageHandle; EFI_HANDLE DriverBindingHandle; -} EFI_DRIVER_BINDING_PROTOCOL; +}; extern EFI_GUID gEfiDriverBindingProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverConfiguration/DriverConfiguration.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverConfiguration/DriverConfiguration.h index f43b816724..783807b600 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverConfiguration/DriverConfiguration.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverConfiguration/DriverConfiguration.h @@ -181,12 +181,12 @@ EFI_STATUS // // Interface structure for the Driver Configuration Protocol // -typedef struct _EFI_DRIVER_CONFIGURATION_PROTOCOL { +struct _EFI_DRIVER_CONFIGURATION_PROTOCOL { EFI_DRIVER_CONFIGURATION_SET_OPTIONS SetOptions; EFI_DRIVER_CONFIGURATION_OPTIONS_VALID OptionsValid; EFI_DRIVER_CONFIGURATION_FORCE_DEFAULTS ForceDefaults; CHAR8 *SupportedLanguages; -} EFI_DRIVER_CONFIGURATION_PROTOCOL; +}; /*++ diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverDiagnostics/DriverDiagnostics.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverDiagnostics/DriverDiagnostics.h index 9a96f47a5e..9eba9901bb 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverDiagnostics/DriverDiagnostics.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/DriverDiagnostics/DriverDiagnostics.h @@ -116,10 +116,10 @@ EFI_STATUS // // Interface structure for the Driver Diagnostics Protocol // -typedef struct _EFI_DRIVER_DIAGNOSTICS_PROTOCOL { +struct _EFI_DRIVER_DIAGNOSTICS_PROTOCOL { EFI_DRIVER_DIAGNOSTICS_RUN_DIAGNOSTICS RunDiagnostics; CHAR8 *SupportedLanguages; -} EFI_DRIVER_DIAGNOSTICS_PROTOCOL; +}; /*++ diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Ebc/Ebc.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Ebc/Ebc.h index 35c4221284..4db26f59de 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Ebc/Ebc.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Ebc/Ebc.h @@ -168,12 +168,12 @@ EFI_STATUS // // Prototype for the actual EBC protocol interface // -typedef struct _EFI_EBC_PROTOCOL { +struct _EFI_EBC_PROTOCOL { EFI_EBC_CREATE_THUNK CreateThunk; EFI_EBC_UNLOAD_IMAGE UnloadImage; EFI_EBC_REGISTER_ICACHE_FLUSH RegisterICacheFlush; EFI_EBC_GET_VERSION GetVersion; -} EFI_EBC_PROTOCOL; +}; // // Extern the global EBC protocol GUID diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/EdidOverride/EdidOverride.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/EdidOverride/EdidOverride.h index d720a789c5..0f6b9c0dd1 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/EdidOverride/EdidOverride.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/EdidOverride/EdidOverride.h @@ -69,9 +69,9 @@ EFI_STATUS --*/ ; -typedef struct _EFI_EDID_OVERRIDE_PROTOCOL { +struct _EFI_EDID_OVERRIDE_PROTOCOL { EFI_EDID_OVERRIDE_PROTOCOL_GET_EDID GetEdid; -} EFI_EDID_OVERRIDE_PROTOCOL; +}; extern EFI_GUID gEfiEdidOverrideProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/EfiNetworkInterfaceIdentifier/EfiNetworkInterfaceIdentifier.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/EfiNetworkInterfaceIdentifier/EfiNetworkInterfaceIdentifier.h index 5a6bedd069..8423c1771d 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/EfiNetworkInterfaceIdentifier/EfiNetworkInterfaceIdentifier.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/EfiNetworkInterfaceIdentifier/EfiNetworkInterfaceIdentifier.h @@ -46,7 +46,7 @@ typedef enum { EfiNetworkInterfaceUndi = 1 } EFI_NETWORK_PROTOCOL_TYPE; -typedef struct _EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL { +struct _EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL { UINT64 Revision; // @@ -94,7 +94,7 @@ typedef struct _EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL { // BOOLEAN Ipv6Supported; UINT8 IfNum; // interface number to be used with pxeid structure -} EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL; +}; extern EFI_GUID gEfiNetworkInterfaceIdentifierProtocolGuid; extern EFI_GUID gEfiNetworkInterfaceIdentifierProtocolGuid_31; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/FormBrowser2/FormBrowser2.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/FormBrowser2/FormBrowser2.h index 9e54e368b7..f762447cb2 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/FormBrowser2/FormBrowser2.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/FormBrowser2/FormBrowser2.h @@ -34,8 +34,6 @@ Abstract: // EFI_FORWARD_DECLARATION (EFI_FORM_BROWSER2_PROTOCOL); -typedef struct _EFI_FORM_BROWSER2_PROTOCOL EFI_FORM_BROWSER2_PROTOCOL; - typedef struct { UINTN LeftColumn; UINTN RightColumn; @@ -126,10 +124,10 @@ Returns: --*/ ; -typedef struct _EFI_FORM_BROWSER2_PROTOCOL { +struct _EFI_FORM_BROWSER2_PROTOCOL { EFI_SEND_FORM2 SendForm; EFI_BROWSER_CALLBACK2 BrowserCallback; -} EFI_FORM_BROWSER2_PROTOCOL; +}; extern EFI_GUID gEfiFormBrowser2ProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/GraphicsOutput/GraphicsOutput.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/GraphicsOutput/GraphicsOutput.h index 6afb558a46..b7e369fc3e 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/GraphicsOutput/GraphicsOutput.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/GraphicsOutput/GraphicsOutput.h @@ -194,12 +194,12 @@ typedef struct { UINTN FrameBufferSize; } EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE; -typedef struct _EFI_GRAPHICS_OUTPUT_PROTOCOL { +struct _EFI_GRAPHICS_OUTPUT_PROTOCOL { EFI_GRAPHICS_OUTPUT_PROTOCOL_QUERY_MODE QueryMode; EFI_GRAPHICS_OUTPUT_PROTOCOL_SET_MODE SetMode; EFI_GRAPHICS_OUTPUT_PROTOCOL_BLT Blt; EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE *Mode; -} EFI_GRAPHICS_OUTPUT_PROTOCOL; +}; extern EFI_GUID gEfiGraphicsOutputProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiConfigAccess/HiiConfigAccess.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiConfigAccess/HiiConfigAccess.h index 4683647a61..c64ae33f20 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiConfigAccess/HiiConfigAccess.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiConfigAccess/HiiConfigAccess.h @@ -136,11 +136,11 @@ EFI_STATUS --*/ ; -typedef struct _EFI_HII_CONFIG_ACCESS_PROTOCOL { +struct _EFI_HII_CONFIG_ACCESS_PROTOCOL { EFI_HII_ACCESS_EXTRACT_CONFIG ExtractConfig; EFI_HII_ACCESS_ROUTE_CONFIG RouteConfig; EFI_HII_ACCESS_FORM_CALLBACK Callback; -} EFI_HII_CONFIG_ACCESS_PROTOCOL; +}; extern EFI_GUID gEfiHiiConfigAccessProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiConfigRouting/HiiConfigRouting.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiConfigRouting/HiiConfigRouting.h index de46fce14d..8357a1fb04 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiConfigRouting/HiiConfigRouting.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiConfigRouting/HiiConfigRouting.h @@ -300,14 +300,14 @@ EFI_STATUS ; -typedef struct _EFI_HII_CONFIG_ROUTING_PROTOCOL { +struct _EFI_HII_CONFIG_ROUTING_PROTOCOL { EFI_HII_EXTRACT_CONFIG ExtractConfig; EFI_HII_EXPORT_CONFIG ExportConfig; EFI_HII_ROUTE_CONFIG RouteConfig; EFI_HII_BLOCK_TO_CONFIG BlockToConfig; EFI_HII_CONFIG_TO_BLOCK ConfigToBlock; EFI_HII_GET_ALT_CFG GetAltConfig; -} EFI_HII_CONFIG_ROUTING_PROTOCOL; +}; extern EFI_GUID gEfiHiiConfigRoutingProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiDatabase/HiiDatabase.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiDatabase/HiiDatabase.h index 5c47e6c1db..ef8e77d0d5 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiDatabase/HiiDatabase.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiDatabase/HiiDatabase.h @@ -431,7 +431,7 @@ EFI_STATUS --*/ ; -typedef struct _EFI_HII_DATABASE_PROTOCOL { +struct _EFI_HII_DATABASE_PROTOCOL { EFI_HII_DATABASE_NEW_PACK NewPackageList; EFI_HII_DATABASE_REMOVE_PACK RemovePackageList; EFI_HII_DATABASE_UPDATE_PACK UpdatePackageList; @@ -443,7 +443,7 @@ typedef struct _EFI_HII_DATABASE_PROTOCOL { EFI_HII_GET_KEYBOARD_LAYOUT GetKeyboardLayout; EFI_HII_SET_KEYBOARD_LAYOUT SetKeyboardLayout; EFI_HII_DATABASE_GET_PACK_HANDLE GetPackageListHandle; -} EFI_HII_DATABASE_PROTOCOL; +}; extern EFI_GUID gEfiHiiDatabaseProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiFont/HiiFont.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiFont/HiiFont.h index 741f4d7335..26d1d36be4 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiFont/HiiFont.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiFont/HiiFont.h @@ -271,12 +271,12 @@ EFI_STATUS // // Interface structure for the EFI_HII_FONT_PROTOCOL // -typedef struct _EFI_HII_FONT_PROTOCOL { +struct _EFI_HII_FONT_PROTOCOL { EFI_HII_STRING_TO_IMAGE StringToImage; EFI_HII_STRING_ID_TO_IMAGE StringIdToImage; EFI_HII_GET_GLYPH GetGlyph; EFI_HII_GET_FONT_INFO GetFontInfo; -} EFI_HII_FONT_PROTOCOL; +}; extern EFI_GUID gEfiHiiFontProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiImage/HiiImage.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiImage/HiiImage.h index dcd4889df0..7359c89522 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiImage/HiiImage.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiImage/HiiImage.h @@ -241,13 +241,13 @@ EFI_STATUS // // Interface structure for the EFI_HII_IMAGE_PROTOCOL // -typedef struct _EFI_HII_IMAGE_PROTOCOL { +struct _EFI_HII_IMAGE_PROTOCOL { EFI_HII_NEW_IMAGE NewImage; EFI_HII_GET_IMAGE GetImage; EFI_HII_SET_IMAGE SetImage; EFI_HII_DRAW_IMAGE DrawImage; EFI_HII_DRAW_IMAGE_ID DrawImageId; -} EFI_HII_IMAGE_PROTOCOL; +}; extern EFI_GUID gEfiHiiImageProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiString/HiiString.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiString/HiiString.h index d1fc9fde44..1e061ebe67 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiString/HiiString.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiString/HiiString.h @@ -227,13 +227,13 @@ EFI_STATUS // // Interface structure for the EFI_HII_STRING_PROTOCOL // -typedef struct _EFI_HII_STRING_PROTOCOL { +struct _EFI_HII_STRING_PROTOCOL { EFI_HII_NEW_STRING NewString; EFI_HII_GET_STRING GetString; EFI_HII_SET_STRING SetString; EFI_HII_GET_LANGUAGES GetLanguages; EFI_HII_GET_2ND_LANGUAGES GetSecondaryLanguages; -} EFI_HII_STRING_PROTOCOL; +}; extern EFI_GUID gEfiHiiStringProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Ip4/Ip4.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Ip4/Ip4.h index a2daf6fdd7..446108e12e 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Ip4/Ip4.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Ip4/Ip4.h @@ -223,7 +223,7 @@ EFI_STATUS IN EFI_IP4_PROTOCOL *This ); -typedef struct _EFI_IP4_PROTOCOL { +struct _EFI_IP4_PROTOCOL { EFI_IP4_GET_MODE_DATA GetModeData; EFI_IP4_CONFIGURE Configure; EFI_IP4_GROUPS Groups; @@ -232,7 +232,7 @@ typedef struct _EFI_IP4_PROTOCOL { EFI_IP4_RECEIVE Receive; EFI_IP4_CANCEL Cancel; EFI_IP4_POLL Poll; -} EFI_IP4_PROTOCOL; +}; extern EFI_GUID gEfiIp4ServiceBindingProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Ip4Config/Ip4Config.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Ip4Config/Ip4Config.h index 350a1cca47..a77a2375c0 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Ip4Config/Ip4Config.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Ip4Config/Ip4Config.h @@ -60,11 +60,11 @@ EFI_STATUS ); -typedef struct _EFI_IP4_CONFIG_PROTOCOL { +struct _EFI_IP4_CONFIG_PROTOCOL { EFI_IP4_CONFIG_START Start; EFI_IP4_CONFIG_STOP Stop; EFI_IP4_CONFIG_GET_DATA GetData; -} EFI_IP4_CONFIG_PROTOCOL; +}; extern EFI_GUID gEfiIp4ConfigProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/LoadFile/LoadFile.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/LoadFile/LoadFile.h index fc8aea5b7a..a7d5027e49 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/LoadFile/LoadFile.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/LoadFile/LoadFile.h @@ -78,9 +78,9 @@ EFI_STATUS --*/ ; -typedef struct _EFI_LOAD_FILE_PROTOCOL { +struct _EFI_LOAD_FILE_PROTOCOL { EFI_LOAD_FILE LoadFile; -} EFI_LOAD_FILE_PROTOCOL; +}; extern EFI_GUID gEfiLoadFileProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/ManagedNetwork/ManagedNetwork.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/ManagedNetwork/ManagedNetwork.h index c0ae939d19..2704f9bd1e 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/ManagedNetwork/ManagedNetwork.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/ManagedNetwork/ManagedNetwork.h @@ -147,7 +147,7 @@ EFI_STATUS IN EFI_MANAGED_NETWORK_PROTOCOL *This ); -typedef struct _EFI_MANAGED_NETWORK_PROTOCOL { +struct _EFI_MANAGED_NETWORK_PROTOCOL { EFI_MANAGED_NETWORK_GET_MODE_DATA GetModeData; EFI_MANAGED_NETWORK_CONFIGURE Configure; EFI_MANAGED_NETWORK_MCAST_IP_TO_MAC McastIpToMac; @@ -156,7 +156,7 @@ typedef struct _EFI_MANAGED_NETWORK_PROTOCOL { EFI_MANAGED_NETWORK_RECEIVE Receive; EFI_MANAGED_NETWORK_CANCEL Cancel; EFI_MANAGED_NETWORK_POLL Poll; -} EFI_MANAGED_NETWORK_PROTOCOL; +}; extern EFI_GUID gEfiManagedNetworkServiceBindingProtocolGuid; extern EFI_GUID gEfiManagedNetworkProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Mtftp4/Mtftp4.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Mtftp4/Mtftp4.h index 5c6d29fbc4..e80ce6ad91 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Mtftp4/Mtftp4.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Mtftp4/Mtftp4.h @@ -274,7 +274,7 @@ EFI_STATUS ); -typedef struct _EFI_MTFTP4_PROTOCOL { +struct _EFI_MTFTP4_PROTOCOL { EFI_MTFTP4_GET_MODE_DATA GetModeData; EFI_MTFTP4_CONFIGURE Configure; EFI_MTFTP4_GET_INFO GetInfo; @@ -283,12 +283,12 @@ typedef struct _EFI_MTFTP4_PROTOCOL { EFI_MTFTP4_WRITE_FILE WriteFile; EFI_MTFTP4_READ_DIRECTORY ReadDirectory; EFI_MTFTP4_POLL Poll; -} EFI_MTFTP4_PROTOCOL; +}; // //MTFTP4 token data // -typedef struct _EFI_MTFTP4_TOKEN{ +struct _EFI_MTFTP4_TOKEN{ IN OUT EFI_STATUS Status; IN EFI_EVENT Event; IN EFI_MTFTP4_OVERRIDE_DATA *OverrideData; @@ -302,7 +302,7 @@ typedef struct _EFI_MTFTP4_TOKEN{ IN EFI_MTFTP4_CHECK_PACKET CheckPacket; IN EFI_MTFTP4_TIMEOUT_CALLBACK TimeoutCallback; IN EFI_MTFTP4_PACKET_NEEDED PacketNeeded; -} EFI_MTFTP4_TOKEN; +}; #endif diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/PciIo/PciIo.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/PciIo/PciIo.h index 425dc5f170..49a381125a 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/PciIo/PciIo.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/PciIo/PciIo.h @@ -250,7 +250,7 @@ EFI_STATUS // // Interface structure for the PCI I/O Protocol // -typedef struct _EFI_PCI_IO_PROTOCOL { +struct _EFI_PCI_IO_PROTOCOL { EFI_PCI_IO_PROTOCOL_POLL_IO_MEM PollMem; EFI_PCI_IO_PROTOCOL_POLL_IO_MEM PollIo; EFI_PCI_IO_PROTOCOL_ACCESS Mem; @@ -268,7 +268,7 @@ typedef struct _EFI_PCI_IO_PROTOCOL { EFI_PCI_IO_PROTOCOL_SET_BAR_ATTRIBUTES SetBarAttributes; UINT64 RomSize; VOID *RomImage; -} EFI_PCI_IO_PROTOCOL; +}; extern EFI_GUID gEfiPciIoProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/PciRootBridgeIo/PciRootBridgeIo.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/PciRootBridgeIo/PciRootBridgeIo.h index 7773c9af0e..2a0bcd1954 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/PciRootBridgeIo/PciRootBridgeIo.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/PciRootBridgeIo/PciRootBridgeIo.h @@ -196,7 +196,7 @@ EFI_STATUS OUT VOID **Resources ); -typedef struct _EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL { +struct _EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL { EFI_HANDLE ParentHandle; EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_POLL_IO_MEM PollMem; EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_POLL_IO_MEM PollIo; @@ -213,7 +213,7 @@ typedef struct _EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL { EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_SET_ATTRIBUTES SetAttributes; EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_CONFIGURATION Configuration; UINT32 SegmentNumber; -} EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL; +}; extern EFI_GUID gEfiPciRootBridgeIoProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/PlatformDriverOverride/PlatformDriverOverride.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/PlatformDriverOverride/PlatformDriverOverride.h index 6d19d14d8a..58d531889b 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/PlatformDriverOverride/PlatformDriverOverride.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/PlatformDriverOverride/PlatformDriverOverride.h @@ -63,11 +63,11 @@ EFI_STATUS // // Interface structure for the Platform Driver Override Protocol // -typedef struct _EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL { +struct _EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL { EFI_PLATFORM_DRIVER_OVERRIDE_GET_DRIVER GetDriver; EFI_PLATFORM_DRIVER_OVERRIDE_GET_DRIVER_PATH GetDriverPath; EFI_PLATFORM_DRIVER_OVERRIDE_DRIVER_LOADED DriverLoaded; -} EFI_PLATFORM_DRIVER_OVERRIDE_PROTOCOL; +}; extern EFI_GUID gEfiPlatformDriverOverrideProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/PxeBaseCode/PxeBaseCode.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/PxeBaseCode/PxeBaseCode.h index 7fc959db34..d3e443ee32 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/PxeBaseCode/PxeBaseCode.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/PxeBaseCode/PxeBaseCode.h @@ -362,7 +362,7 @@ EFI_STATUS // #define EFI_PXE_BASE_CODE_INTERFACE_REVISION 0x00010000 -typedef struct _EFI_PXE_BASE_CODE_PROTOCOL { +struct _EFI_PXE_BASE_CODE_PROTOCOL { UINT64 Revision; EFI_PXE_BASE_CODE_START Start; EFI_PXE_BASE_CODE_STOP Stop; @@ -377,7 +377,7 @@ typedef struct _EFI_PXE_BASE_CODE_PROTOCOL { EFI_PXE_BASE_CODE_SET_STATION_IP SetStationIp; EFI_PXE_BASE_CODE_SET_PACKETS SetPackets; EFI_PXE_BASE_CODE_MODE *Mode; -} EFI_PXE_BASE_CODE_PROTOCOL; +}; extern EFI_GUID gEfiPxeBaseCodeProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/PxeBaseCodeCallBack/PxeBaseCodeCallBack.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/PxeBaseCodeCallBack/PxeBaseCodeCallBack.h index bc9305818d..9e18a6760d 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/PxeBaseCodeCallBack/PxeBaseCodeCallBack.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/PxeBaseCodeCallBack/PxeBaseCodeCallBack.h @@ -70,10 +70,10 @@ typedef EFI_PXE_BASE_CODE_CALLBACK_STATUS (EFIAPI *EFI_PXE_CALLBACK) IN EFI_PXE_BASE_CODE_PACKET * Packet OPTIONAL ); -typedef struct _EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL { +struct _EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL { UINT64 Revision; EFI_PXE_CALLBACK Callback; -} EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL; +}; extern EFI_GUID gEfiPxeBaseCodeCallbackProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/ScsiPassThru/ScsiPassThru.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/ScsiPassThru/ScsiPassThru.h index 88887aef57..325c25fc1b 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/ScsiPassThru/ScsiPassThru.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/ScsiPassThru/ScsiPassThru.h @@ -317,7 +317,7 @@ EFI_STATUS --*/ ; -typedef struct _EFI_SCSI_PASS_THRU_PROTOCOL { +struct _EFI_SCSI_PASS_THRU_PROTOCOL { EFI_SCSI_PASS_THRU_MODE *Mode; EFI_SCSI_PASS_THRU_PASSTHRU PassThru; EFI_SCSI_PASS_THRU_GET_NEXT_DEVICE GetNextDevice; @@ -325,7 +325,7 @@ typedef struct _EFI_SCSI_PASS_THRU_PROTOCOL { EFI_SCSI_PASS_THRU_GET_TARGET_LUN GetTargetLun; EFI_SCSI_PASS_THRU_RESET_CHANNEL ResetChannel; EFI_SCSI_PASS_THRU_RESET_TARGET ResetTarget; -} EFI_SCSI_PASS_THRU_PROTOCOL; +}; extern EFI_GUID gEfiScsiPassThruProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SerialIo/SerialIo.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SerialIo/SerialIo.h index 54a653ad53..5bead18401 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SerialIo/SerialIo.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SerialIo/SerialIo.h @@ -279,7 +279,7 @@ typedef struct { #define SERIAL_IO_INTERFACE_REVISION 0x00010000 -typedef struct _EFI_SERIAL_IO_PROTOCOL { +struct _EFI_SERIAL_IO_PROTOCOL { UINT32 Revision; EFI_SERIAL_RESET Reset; EFI_SERIAL_SET_ATTRIBUTES SetAttributes; @@ -289,7 +289,7 @@ typedef struct _EFI_SERIAL_IO_PROTOCOL { EFI_SERIAL_READ Read; EFI_SERIAL_IO_MODE *Mode; -} EFI_SERIAL_IO_PROTOCOL; +}; extern EFI_GUID gEfiSerialIoProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/ServiceBinding/ServiceBinding.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/ServiceBinding/ServiceBinding.h index 7751c838ca..3c943c166a 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/ServiceBinding/ServiceBinding.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/ServiceBinding/ServiceBinding.h @@ -80,9 +80,9 @@ EFI_STATUS --*/ ; -typedef struct _EFI_SERVICE_BINDING_PROTOCOL { +struct _EFI_SERVICE_BINDING_PROTOCOL { EFI_SERVICE_BINDING_CREATE_CHILD CreateChild; EFI_SERVICE_BINDING_DESTROY_CHILD DestroyChild; -} EFI_SERVICE_BINDING_PROTOCOL; +}; #endif diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleFileSystem/SimpleFileSystem.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleFileSystem/SimpleFileSystem.h index da66ba5f7d..7e36111e95 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleFileSystem/SimpleFileSystem.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleFileSystem/SimpleFileSystem.h @@ -65,10 +65,10 @@ EFI_STATUS #define EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_REVISION 0x00010000 -typedef struct _EFI_SIMPLE_FILE_SYSTEM_PROTOCOL { +struct _EFI_SIMPLE_FILE_SYSTEM_PROTOCOL { UINT64 Revision; EFI_VOLUME_OPEN OpenVolume; -} EFI_SIMPLE_FILE_SYSTEM_PROTOCOL; +}; typedef EFI_STATUS @@ -356,7 +356,7 @@ EFI_STATUS ; #define EFI_FILE_HANDLE_REVISION 0x00010000 -typedef struct _EFI_FILE { +struct _EFI_FILE { UINT64 Revision; EFI_FILE_OPEN Open; EFI_FILE_CLOSE Close; @@ -368,8 +368,7 @@ typedef struct _EFI_FILE { EFI_FILE_GET_INFO GetInfo; EFI_FILE_SET_INFO SetInfo; EFI_FILE_FLUSH Flush; -} -EFI_FILE, *EFI_FILE_HANDLE; +} *EFI_FILE_HANDLE; extern EFI_GUID gEfiSimpleFileSystemProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleNetwork/SimpleNetwork.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleNetwork/SimpleNetwork.h index 8c79745f4c..75514c63e4 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleNetwork/SimpleNetwork.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleNetwork/SimpleNetwork.h @@ -615,7 +615,7 @@ EFI_STATUS #define EFI_SIMPLE_NETWORK_PROTOCOL_REVISION 0x00010000 -typedef struct _EFI_SIMPLE_NETWORK_PROTOCOL { +struct _EFI_SIMPLE_NETWORK_PROTOCOL { UINT64 Revision; EFI_SIMPLE_NETWORK_START Start; EFI_SIMPLE_NETWORK_STOP Stop; @@ -632,7 +632,7 @@ typedef struct _EFI_SIMPLE_NETWORK_PROTOCOL { EFI_SIMPLE_NETWORK_RECEIVE Receive; EFI_EVENT WaitForPacket; EFI_SIMPLE_NETWORK_MODE *Mode; -} EFI_SIMPLE_NETWORK_PROTOCOL; +}; extern EFI_GUID gEfiSimpleNetworkProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimplePointer/SimplePointer.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimplePointer/SimplePointer.h index 35aed1d987..e286d5d7e3 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimplePointer/SimplePointer.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimplePointer/SimplePointer.h @@ -64,12 +64,12 @@ EFI_STATUS IN OUT EFI_SIMPLE_POINTER_STATE * State ); -typedef struct _EFI_SIMPLE_POINTER_PROTOCOL { +struct _EFI_SIMPLE_POINTER_PROTOCOL { EFI_SIMPLE_POINTER_RESET Reset; EFI_SIMPLE_POINTER_GET_STATE GetState; EFI_EVENT WaitForInput; EFI_SIMPLE_POINTER_MODE *Mode; -} EFI_SIMPLE_POINTER_PROTOCOL; +}; extern EFI_GUID gEfiSimplePointerProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextIn/SimpleTextIn.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextIn/SimpleTextIn.h index 620acf65d0..a9b39e991e 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextIn/SimpleTextIn.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextIn/SimpleTextIn.h @@ -125,11 +125,11 @@ EFI_STATUS --*/ ; -typedef struct _EFI_SIMPLE_TEXT_IN_PROTOCOL { +struct _EFI_SIMPLE_TEXT_IN_PROTOCOL { EFI_INPUT_RESET Reset; EFI_INPUT_READ_KEY ReadKeyStroke; EFI_EVENT WaitForKey; -} EFI_SIMPLE_TEXT_IN_PROTOCOL; +}; extern EFI_GUID gEfiSimpleTextInProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextInputEx/SimpleTextInputEx.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextInputEx/SimpleTextInputEx.h index 1c0fe72607..6ce2df4b12 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextInputEx/SimpleTextInputEx.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextInputEx/SimpleTextInputEx.h @@ -241,14 +241,14 @@ EFI_STATUS --*/ ; -typedef struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL { +struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL { EFI_INPUT_RESET_EX Reset; EFI_INPUT_READ_KEY_EX ReadKeyStrokeEx; EFI_EVENT WaitForKeyEx; EFI_SET_STATE SetState; EFI_REGISTER_KEYSTROKE_NOTIFY RegisterKeyNotify; EFI_UNREGISTER_KEYSTROKE_NOTIFY UnregisterKeyNotify; -} EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL; +}; extern EFI_GUID gEfiSimpleTextInputExProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextOut/SimpleTextOut.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextOut/SimpleTextOut.h index 286ebda44e..6d54fbc291 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextOut/SimpleTextOut.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/SimpleTextOut/SimpleTextOut.h @@ -398,7 +398,7 @@ typedef struct { BOOLEAN CursorVisible; } EFI_SIMPLE_TEXT_OUTPUT_MODE; -typedef struct _EFI_SIMPLE_TEXT_OUT_PROTOCOL { +struct _EFI_SIMPLE_TEXT_OUT_PROTOCOL { EFI_TEXT_RESET Reset; EFI_TEXT_OUTPUT_STRING OutputString; @@ -416,7 +416,7 @@ typedef struct _EFI_SIMPLE_TEXT_OUT_PROTOCOL { // Current mode // EFI_SIMPLE_TEXT_OUTPUT_MODE *Mode; -} EFI_SIMPLE_TEXT_OUT_PROTOCOL; +}; extern EFI_GUID gEfiSimpleTextOutProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Tcp4/Tcp4.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Tcp4/Tcp4.h index e4d1e3efe1..786c6d3766 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Tcp4/Tcp4.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Tcp4/Tcp4.h @@ -227,7 +227,7 @@ EFI_STATUS IN EFI_TCP4_PROTOCOL *This ); -typedef struct _EFI_TCP4_PROTOCOL { +struct _EFI_TCP4_PROTOCOL { EFI_TCP4_GET_MODE_DATA GetModeData; EFI_TCP4_CONFIGURE Configure; EFI_TCP4_ROUTES Routes; @@ -238,7 +238,7 @@ typedef struct _EFI_TCP4_PROTOCOL { EFI_TCP4_CLOSE Close; EFI_TCP4_CANCEL Cancel; EFI_TCP4_POLL Poll; -} EFI_TCP4_PROTOCOL; +}; #define EFI_CONNECTION_FIN EFIERR (104) #define EFI_CONNECTION_RESET EFIERR (105) diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Udp4/Udp4.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Udp4/Udp4.h index c8730a7222..a741fbe2d9 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Udp4/Udp4.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Udp4/Udp4.h @@ -196,7 +196,7 @@ EFI_STATUS IN EFI_UDP4_PROTOCOL *This ); -typedef struct _EFI_UDP4_PROTOCOL { +struct _EFI_UDP4_PROTOCOL { EFI_UDP4_GET_MODE_DATA GetModeData; EFI_UDP4_CONFIGURE Configure; EFI_UDP4_GROUPS Groups; @@ -205,7 +205,7 @@ typedef struct _EFI_UDP4_PROTOCOL { EFI_UDP4_RECEIVE Receive; EFI_UDP4_CANCEL Cancel; EFI_UDP4_POLL Poll; -} EFI_UDP4_PROTOCOL; +}; extern EFI_GUID gEfiUdp4ServiceBindingProtocolGuid; extern EFI_GUID gEfiUdp4ProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/UgaDraw/UgaDraw.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/UgaDraw/UgaDraw.h index cc7ca211b9..7ff1555c53 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/UgaDraw/UgaDraw.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/UgaDraw/UgaDraw.h @@ -170,11 +170,11 @@ EFI_STATUS --*/ ; -typedef struct _EFI_UGA_DRAW_PROTOCOL { +struct _EFI_UGA_DRAW_PROTOCOL { EFI_UGA_DRAW_PROTOCOL_GET_MODE GetMode; EFI_UGA_DRAW_PROTOCOL_SET_MODE SetMode; EFI_UGA_DRAW_PROTOCOL_BLT Blt; -} EFI_UGA_DRAW_PROTOCOL; +}; extern EFI_GUID gEfiUgaDrawProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/UgaIo/UgaIo.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/UgaIo/UgaIo.h index 1bfb0494b7..585140ee44 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/UgaIo/UgaIo.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/UgaIo/UgaIo.h @@ -200,11 +200,11 @@ typedef UGA_STATUS (EFIAPI *PUGA_FW_SERVICE_DISPATCH) (IN PUGA_DEVICE pDevice, I Varies depending on pIoRequest. --*/ -typedef struct _EFI_UGA_IO_PROTOCOL { +struct _EFI_UGA_IO_PROTOCOL { EFI_UGA_IO_PROTOCOL_CREATE_DEVICE CreateDevice; EFI_UGA_IO_PROTOCOL_DELETE_DEVICE DeleteDevice; PUGA_FW_SERVICE_DISPATCH DispatchService; -} EFI_UGA_IO_PROTOCOL; +}; extern EFI_GUID gEfiUgaIoProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/UnicodeCollation/UnicodeCollation.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/UnicodeCollation/UnicodeCollation.h index f4930b1b71..ac89bfc130 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/UnicodeCollation/UnicodeCollation.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/UnicodeCollation/UnicodeCollation.h @@ -193,7 +193,7 @@ BOOLEAN --*/ ; -typedef struct _EFI_UNICODE_COLLATION_PROTOCOL { +struct _EFI_UNICODE_COLLATION_PROTOCOL { // // general // @@ -209,7 +209,7 @@ typedef struct _EFI_UNICODE_COLLATION_PROTOCOL { EFI_UNICODE_COLLATION_STRTOFAT StrToFat; CHAR8 *SupportedLanguages; -} EFI_UNICODE_COLLATION_PROTOCOL; +}; extern EFI_GUID gEfiUnicodeCollationProtocolGuid; extern EFI_GUID gEfiUnicodeCollation2ProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/UsbHostController/UsbHostController.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/UsbHostController/UsbHostController.h index 0061fd9793..0a2391ed4c 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/UsbHostController/UsbHostController.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/UsbHostController/UsbHostController.h @@ -186,7 +186,7 @@ EFI_STATUS IN EFI_USB_PORT_FEATURE PortFeature ); -typedef struct _EFI_USB_HC_PROTOCOL { +struct _EFI_USB_HC_PROTOCOL { EFI_USB_HC_PROTOCOL_RESET Reset; EFI_USB_HC_PROTOCOL_GET_STATE GetState; EFI_USB_HC_PROTOCOL_SET_STATE SetState; @@ -202,7 +202,7 @@ typedef struct _EFI_USB_HC_PROTOCOL { EFI_USB_HC_PROTOCOL_CLEAR_ROOTHUB_PORT_FEATURE ClearRootHubPortFeature; UINT16 MajorRevision; UINT16 MinorRevision; -} EFI_USB_HC_PROTOCOL; +}; extern EFI_GUID gEfiUsbHcProtocolGuid; @@ -388,7 +388,7 @@ EFI_STATUS IN EFI_USB_PORT_FEATURE PortFeature ); -typedef struct _EFI_USB2_HC_PROTOCOL { +struct _EFI_USB2_HC_PROTOCOL { EFI_USB2_HC_PROTOCOL_GET_CAPABILITY GetCapability; EFI_USB2_HC_PROTOCOL_RESET Reset; EFI_USB2_HC_PROTOCOL_GET_STATE GetState; @@ -404,7 +404,7 @@ typedef struct _EFI_USB2_HC_PROTOCOL { EFI_USB2_HC_PROTOCOL_CLEAR_ROOTHUB_PORT_FEATURE ClearRootHubPortFeature; UINT16 MajorRevision; UINT16 MinorRevision; -} EFI_USB2_HC_PROTOCOL; +}; extern EFI_GUID gEfiUsb2HcProtocolGuid; diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/UsbIo/UsbIo.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/UsbIo/UsbIo.h index 41c0ccb6d6..7b9823c647 100644 --- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/UsbIo/UsbIo.h +++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/UsbIo/UsbIo.h @@ -173,7 +173,7 @@ EFI_STATUS // // Protocol Interface Structure // -typedef struct _EFI_USB_IO_PROTOCOL { +struct _EFI_USB_IO_PROTOCOL { // // IO transfer // @@ -198,7 +198,7 @@ typedef struct _EFI_USB_IO_PROTOCOL { // Reset controller's parent port // EFI_USB_IO_PORT_RESET UsbPortReset; -} EFI_USB_IO_PROTOCOL; +}; extern EFI_GUID gEfiUsbIoProtocolGuid; -- 2.39.2