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

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4929 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jljusten 2008-03-20 20:45:58 +00:00
parent e5bce2758f
commit 9c09284182
29 changed files with 60 additions and 60 deletions

View File

@ -111,11 +111,11 @@ EFI_STATUS
typedef struct _EFI_CONSOLE_CONTROL_PROTOCOL {
struct _EFI_CONSOLE_CONTROL_PROTOCOL {
EFI_CONSOLE_CONTROL_PROTOCOL_GET_MODE GetMode;
EFI_CONSOLE_CONTROL_PROTOCOL_SET_MODE SetMode;
EFI_CONSOLE_CONTROL_PROTOCOL_LOCK_STD_IN LockStdIn;
} EFI_CONSOLE_CONTROL_PROTOCOL;
};
extern EFI_GUID gEfiConsoleControlProtocolGuid;

View File

@ -129,10 +129,10 @@ Returns:
--*/
typedef struct _EFI_CUSTOMIZED_DECOMPRESS_PROTOCOL {
struct _EFI_CUSTOMIZED_DECOMPRESS_PROTOCOL {
EFI_CUSTOMIZED_DECOMPRESS_GET_INFO GetInfo;
EFI_CUSTOMIZED_DECOMPRESS_DECOMPRESS Decompress;
} EFI_CUSTOMIZED_DECOMPRESS_PROTOCOL;
};
extern EFI_GUID gEfiCustomizedDecompressProtocolGuid;

View File

@ -73,7 +73,7 @@ EFI_STATUS
IN UINTN ErrorLevel
);
typedef struct _EFI_DEBUG_ASSERT_PROTOCOL {
struct _EFI_DEBUG_ASSERT_PROTOCOL {
EFI_DEBUG_ASSERT Assert;
EFI_DEBUG_PRINT Print;
@ -82,7 +82,7 @@ typedef struct _EFI_DEBUG_ASSERT_PROTOCOL {
EFI_GET_ERROR_LEVEL GetErrorLevel;
EFI_SET_ERROR_LEVEL SetErrorLevel;
} EFI_DEBUG_ASSERT_PROTOCOL;
};
extern EFI_GUID gEfiDebugAssertProtocolGuid;

View File

@ -57,11 +57,11 @@ EFI_STATUS
//
// DebugMask protocol definition
//
typedef struct _EFI_DEBUG_MASK_PROTOCOL {
struct _EFI_DEBUG_MASK_PROTOCOL {
INT64 Revision;
EFI_GET_DEBUG_MASK GetDebugMask;
EFI_SET_DEBUG_MASK SetDebugMask;
} EFI_DEBUG_MASK_PROTOCOL;
};
extern EFI_GUID gEfiDebugMaskProtocolGuid;

View File

@ -167,13 +167,13 @@ extern EFI_GUID gEfiDiskInfoUsbInterfaceGuid;
}
extern EFI_GUID gEfiDiskInfoAhciInterfaceGuid;
typedef struct _EFI_DISK_INFO_PROTOCOL {
struct _EFI_DISK_INFO_PROTOCOL {
EFI_GUID Interface;
EFI_DISK_INFO_INQUIRY Inquiry;
EFI_DISK_INFO_IDENTIFY Identify;
EFI_DISK_INFO_SENSE_DATA SenseData;
EFI_DISK_INFO_WHICH_IDE WhichIde;
} EFI_DISK_INFO_PROTOCOL;
};
extern EFI_GUID gEfiDiskInfoProtocolGuid;

View File

@ -69,9 +69,9 @@ EFI_STATUS
);
typedef struct _EFI_OEM_BADGING_PROTOCOL {
struct _EFI_OEM_BADGING_PROTOCOL {
EFI_BADGING_GET_IMAGE GetImage;
} EFI_OEM_BADGING_PROTOCOL;
};
extern EFI_GUID gEfiOEMBadgingProtocolGuid;

View File

@ -105,13 +105,13 @@ EFI_STATUS
//
// Extended Sal Boot Service Protocol Interface
//
typedef struct _EXTENDED_SAL_BOOT_SERVICE_PROTOCOL{
struct _EXTENDED_SAL_BOOT_SERVICE_PROTOCOL {
EXTENDED_SAL_ADD_SST_INFO AddSalSystemTableInfo;
EXTENDED_SAL_ADD_SST_ENTRY AddSalSystemTableEntry;
EXTENDED_SAL_REGISTER_INTERNAL_PROC AddExtendedSalProc;
SAL_EXTENDED_SAL_PROC ExtendedSalProc;
SAL_PROC SalProc;
} EXTENDED_SAL_BOOT_SERVICE_PROTOCOL;
};
extern EFI_GUID gEfiExtendedSalBootServiceProtocolGuid;

View File

@ -79,9 +79,9 @@ Returns:
//
// Protocol declaration
//
typedef struct _EFI_FTW_LITE_PROTOCOL {
struct _EFI_FTW_LITE_PROTOCOL {
EFI_FTW_LITE_WRITE Write;
} EFI_FTW_LITE_PROTOCOL;
};
extern EFI_GUID gEfiFaultTolerantWriteLiteProtocolGuid;

View File

@ -43,9 +43,9 @@ EFI_STATUS
//
// IPMI TRANSPORT PROTOCOL
//
typedef struct _EFI_FVB_EXTENSION_PROTOCOL {
struct _EFI_FVB_EXTENSION_PROTOCOL {
EFI_FV_ERASE_CUSTOM_BLOCK EraseFvbCustomBlock;
} EFI_FVB_EXTENSION_PROTOCOL;
};
extern EFI_GUID gEfiFvbExtensionProtocolGuid;

View File

@ -143,12 +143,12 @@ EFI_STATUS
--*/
;
typedef struct _EFI_GENERIC_MEMORY_TEST_PROTOCOL {
struct _EFI_GENERIC_MEMORY_TEST_PROTOCOL {
EFI_MEMORY_TEST_INIT MemoryTestInit;
EFI_PERFORM_MEMORY_TEST PerformMemoryTest;
EFI_MEMORY_TEST_FINISHED Finished;
EFI_MEMORY_TEST_COMPATIBLE_RANGE CompatibleRangeTest;
} EFI_GENERIC_MEMORY_TEST_PROTOCOL;
};
extern EFI_GUID gEfiGenericMemTestProtocolGuid;
#endif

View File

@ -61,9 +61,9 @@ EFI_STATUS
//
// Protocol definition
//
typedef struct _EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL {
struct _EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL {
EFI_EXTRACT_GUIDED_SECTION ExtractSection;
} EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL;
};
//
// may add other GUID here

View File

@ -169,7 +169,7 @@ EFI_STATUS
//
// Interface structure for the ISA I/O Protocol
//
typedef struct _EFI_ISA_IO_PROTOCOL {
struct _EFI_ISA_IO_PROTOCOL {
EFI_ISA_IO_PROTOCOL_ACCESS Mem;
EFI_ISA_IO_PROTOCOL_ACCESS Io;
EFI_ISA_IO_PROTOCOL_COPY_MEM CopyMem;
@ -181,7 +181,7 @@ typedef struct _EFI_ISA_IO_PROTOCOL {
EFI_ISA_ACPI_RESOURCE_LIST *ResourceList;
UINT32 RomSize;
VOID *RomImage;
} EFI_ISA_IO_PROTOCOL;
};
extern EFI_GUID gEfiIsaIoProtocolGuid;
@ -345,7 +345,7 @@ Returns:
//
// Interface structure for the Light ISA I/O Protocol
//
typedef struct _EFI_LIGHT_ISA_IO_PROTOCOL {
struct _EFI_LIGHT_ISA_IO_PROTOCOL {
EFI_LIGHT_ISA_IO_PROTOCOL_ACCESS Io;
EFI_LIGHT_ISA_IO_PROTOCOL_MAP Map;
EFI_LIGHT_ISA_IO_PROTOCOL_UNMAP Unmap;
@ -353,7 +353,7 @@ typedef struct _EFI_LIGHT_ISA_IO_PROTOCOL {
EFI_ISA_ACPI_RESOURCE_LIST *ResourceList;
UINT32 RomSize;
VOID *RomImage;
} EFI_LIGHT_ISA_IO_PROTOCOL;
};
extern EFI_GUID gEfiLightIsaIoProtocolGuid;

View File

@ -110,10 +110,10 @@ BOOLEAN
--*/
;
typedef struct _EFI_LEGACY_BIOS_THUNK_PROTOCOL {
struct _EFI_LEGACY_BIOS_THUNK_PROTOCOL {
EFI_LEGACY_BIOS_THUNK_INT86 Int86;
EFI_LEGACY_BIOS_THUNK_FARCALL86 FarCall86;
} EFI_LEGACY_BIOS_THUNK_PROTOCOL;
};
extern EFI_GUID gEfiLegacyBiosThunkProtocolGuid;

View File

@ -53,10 +53,10 @@ EFI_STATUS
IN EFI_HANDLE ImageHandle
);
typedef struct _EFI_PE32_IMAGE_PROTOCOL {
struct _EFI_PE32_IMAGE_PROTOCOL {
LOAD_PE_IMAGE LoadPeImage;
UNLOAD_PE_IMAGE UnLoadPeImage;
} EFI_PE32_IMAGE_PROTOCOL;
};
extern EFI_GUID gEfiLoadPeImageGuid;

View File

@ -45,9 +45,9 @@ EFI_STATUS
typedef struct _EFI_PCI_HOTPLUG_REQUEST_PROTOCOL {
struct _EFI_PCI_HOTPLUG_REQUEST_PROTOCOL {
EFI_PCI_HOTPLUG_REQUEST_NOTIFY Notify;
} EFI_PCI_HOTPLUG_REQUEST_PROTOCOL;
};
extern EFI_GUID gEfiPciHotPlugRequestProtocolGuid;

View File

@ -91,11 +91,11 @@ EFI_GAUGE_DATA *
);
typedef struct _EFI_PERFORMANCE_PROTOCOL{
struct _EFI_PERFORMANCE_PROTOCOL {
EFI_PERF_START_GAUGE StartGauge;
EFI_PERF_END_GAUGE EndGauge;
EFI_PERF_GET_GAUGE GetGauge;
} EFI_PERFORMANCE_PROTOCOL;
};
extern EFI_GUID gEfiPerformanceProtocolGuid;

View File

@ -240,7 +240,7 @@ EFI_STATUS
OUT BOOLEAN *Overlap
);
typedef struct _EFI_PLATFORM_MEMTEST_PROTOCOL {
struct _EFI_PLATFORM_MEMTEST_PROTOCOL {
EFI_PLATFORM_MEMTEST_NOTIFY_PHASE NotifyPhase;
EFI_PLATFORM_MEMTEST_GET_PLATFORM_INFO GetPlatformInfo;
EFI_PLATFORM_MEMTEST_GET_NEXT_DIMM_INFO GetNextDimmInfo;
@ -252,7 +252,7 @@ typedef struct _EFI_PLATFORM_MEMTEST_PROTOCOL {
EFI_PLATFORM_MEMTEST_CLEAR_ERROR ClearError;
EFI_PLATFORM_MEMTEST_DISABLE_DIMM DisableDimm;
EFI_PLATFORM_MEMTEST_OVERLAP Overlap;
} EFI_PLATFORM_MEMTEST_PROTOCOL;
};

View File

@ -41,9 +41,9 @@ UINTN
IN VA_LIST Marker
);
typedef struct _EFI_PRINT_PROTOCOL {
struct _EFI_PRINT_PROTOCOL {
EFI_VSPRINT VSPrint;
} EFI_PRINT_PROTOCOL;
};
extern EFI_GUID gEfiPrintProtocolGuid;

View File

@ -40,10 +40,10 @@ EFI_STATUS
IN EFI_HANDLE Handle
);
typedef struct _EFI_PS2_POLICY_PROTOCOL {
struct _EFI_PS2_POLICY_PROTOCOL {
UINT8 KeyboardLight;
EFI_PS2_INIT_HARDWARE Ps2InitHardware;
} EFI_PS2_POLICY_PROTOCOL;
};
extern EFI_GUID gEfiPs2PolicyProtocolGuid;

View File

@ -328,7 +328,7 @@ EFI_STATUS
#define EFI_PXE_DHCP4_PROTOCOL_REVISION 0x00010000
typedef struct _EFI_PXE_DHCP4_PROTOCOL {
struct _EFI_PXE_DHCP4_PROTOCOL {
UINT64 Revision;
EFI_PXE_DHCP4_RUN Run;
EFI_PXE_DHCP4_SETUP Setup;
@ -338,7 +338,7 @@ typedef struct _EFI_PXE_DHCP4_PROTOCOL {
EFI_PXE_DHCP4_REBIND Rebind;
EFI_PXE_DHCP4_RELEASE Release;
EFI_PXE_DHCP4_DATA *Data;
} EFI_PXE_DHCP4_PROTOCOL;
};
//
//

View File

@ -71,10 +71,10 @@ EFI_PXE_DHCP4_CALLBACK_STATUS
IN DHCP4_PACKET *Packet OPTIONAL
);
typedef struct _EFI_PXE_DHCP4_CALLBACK_PROTOCOL {
struct _EFI_PXE_DHCP4_CALLBACK_PROTOCOL {
UINT64 Revision;
EFI_PXE_DHCP4_CALLBACK Callback;
} EFI_PXE_DHCP4_CALLBACK_PROTOCOL;
};
//
// GUID declaration

View File

@ -129,13 +129,13 @@ EFI_STATUS
OUT EFI_PHYSICAL_ADDRESS *EventLogLastEntry
);
typedef struct _EFI_TCG_PROTOCOL {
struct _EFI_TCG_PROTOCOL {
EFI_TCG_STATUS_CHECK StatusCheck;
EFI_TCG_HASH_ALL HashAll;
EFI_TCG_LOG_EVENT LogEvent;
EFI_TCG_PASS_THROUGH_TO_TPM PassThroughToTpm;
EFI_TCG_HASH_LOG_EXTEND_EVENT HashLogExtendEvent;
} EFI_TCG_PROTOCOL;
};
extern EFI_GUID gEfiTcgProtocolGuid;

View File

@ -99,11 +99,11 @@ EFI_STATUS
//
// TCP Protocol structure
//
typedef struct _EFI_TCP_PROTOCOL {
struct _EFI_TCP_PROTOCOL {
EFI_TCP_WRITE TcpWrite;
EFI_TCP_READ TcpRead;
EFI_TCP_SET_PORT_FILTER SetPortFilter;
} EFI_TCP_PROTOCOL;
};
extern EFI_GUID gEfiTcpProtocolGuid;

View File

@ -129,10 +129,10 @@ Returns:
--*/
typedef struct _EFI_TIANO_DECOMPRESS_PROTOCOL {
struct _EFI_TIANO_DECOMPRESS_PROTOCOL {
EFI_TIANO_DECOMPRESS_GET_INFO GetInfo;
EFI_TIANO_DECOMPRESS_DECOMPRESS Decompress;
} EFI_TIANO_DECOMPRESS_PROTOCOL;
};
extern EFI_GUID gEfiTianoDecompressProtocolGuid;

View File

@ -34,11 +34,11 @@ Abstract:
typedef struct _EFI_UGA_SPLASH_PROTOCOL EFI_UGA_SPLASH_PROTOCOL;
typedef struct _EFI_UGA_SPLASH_PROTOCOL {
struct _EFI_UGA_SPLASH_PROTOCOL {
UINT32 PixelWidth;
UINT32 PixelHeight;
EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Image;
} EFI_UGA_SPLASH_PROTOCOL;
};
extern EFI_GUID gEfiUgaSplashProtocolGuid;

View File

@ -72,11 +72,11 @@ EFI_STATUS
//
// Protocol Interface Structure
//
typedef struct _EFI_USB_ATAPI_PROTOCOL {
struct _EFI_USB_ATAPI_PROTOCOL {
EFI_USB_ATAPI_PACKET_CMD UsbAtapiPacketCmd;
EFI_USB_MASS_STORAGE_RESET UsbAtapiReset;
UINT32 CommandProtocol;
} EFI_USB_ATAPI_PROTOCOL;
};
extern EFI_GUID gEfiUsbAtapiProtocolGuid;

View File

@ -68,7 +68,7 @@ EFI_STATUS
IN EFI_VARIABLE_STORE_PROTOCOL *This
);
typedef struct _EFI_VARIABLE_STORE_PROTOCOL {
struct _EFI_VARIABLE_STORE_PROTOCOL {
//
// Number of banks and bank size
@ -84,7 +84,7 @@ typedef struct _EFI_VARIABLE_STORE_PROTOCOL {
EFI_UPDATE_STORE UpdateStore;
EFI_CLEANUP_STORE CleanupStore;
} EFI_VARIABLE_STORE_PROTOCOL;
};
//
//

View File

@ -51,7 +51,7 @@ EFI_STATUS
EFI_DEVICE_ERROR - The device is not functioning properly.
--*/
typedef struct _EFI_VGA_MINI_PORT_PROTOCOL {
struct _EFI_VGA_MINI_PORT_PROTOCOL {
EFI_VGA_MINI_PORT_SET_MODE SetMode;
UINT64 VgaMemoryOffset;
@ -63,7 +63,7 @@ typedef struct _EFI_VGA_MINI_PORT_PROTOCOL {
UINT8 CrtcDataRegisterBar;
UINT8 MaxMode;
} EFI_VGA_MINI_PORT_PROTOCOL;
};
extern EFI_GUID gEfiVgaMiniPortProtocolGuid;

View File

@ -52,11 +52,11 @@ EFI_STATUS
);
typedef struct _EFI_VIRTUAL_MEMORY_ACCESS_PROTOCOL {
struct _EFI_VIRTUAL_MEMORY_ACCESS_PROTOCOL {
EFI_VIRTUAL_MEMORY_ACCESS_GET_PAGE_SIZE GetPageSize;
EFI_VIRTUAL_MEMORY_ACCESS_MAP Map;
EFI_VIRTUAL_MEMORY_ACCESS_UNMAP UnMap;
} EFI_VIRTUAL_MEMORY_ACCESS_PROTOCOL;
};
extern EFI_GUID gEfiVirtualMemoryAccessProtocolGuid;