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
This commit is contained in:
jljusten 2008-03-20 16:37:48 +00:00
parent 91aac0e466
commit e5bce2758f
54 changed files with 116 additions and 119 deletions

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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...

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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

View File

@ -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;

View File

@ -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;

View File

@ -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;
};
/*++

View File

@ -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;
};
/*++

View File

@ -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

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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)

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;