From 6f80bb860fa8d8dfc5e3101338f3d0e74d0fc269 Mon Sep 17 00:00:00 2001 From: jljusten Date: Thu, 20 Mar 2008 21:08:53 +0000 Subject: Removed extra typedefs on structures to fix error generated by gcc. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4937 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Foundation/Core/Dxe/ArchProtocol/Bds/Bds.h | 4 ++-- .../Foundation/Core/Dxe/ArchProtocol/Cpu/Cpu.h | 4 ++-- .../Foundation/Core/Dxe/ArchProtocol/Metronome/Metronome.h | 4 ++-- .../Foundation/Core/Dxe/ArchProtocol/Runtime/Runtime.h | 12 ++++++------ .../Foundation/Core/Dxe/ArchProtocol/Security/Security.h | 4 ++-- .../Foundation/Core/Dxe/ArchProtocol/StatusCode/StatusCode.h | 4 ++-- .../Foundation/Core/Dxe/ArchProtocol/Timer/Timer.h | 4 ++-- .../Core/Dxe/ArchProtocol/WatchdogTimer/WatchdogTimer.h | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/Bds/Bds.h b/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/Bds/Bds.h index ac8560aec9..2ee56fe896 100644 --- a/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/Bds/Bds.h +++ b/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/Bds/Bds.h @@ -72,9 +72,9 @@ Returns: // // Interface stucture for the BDS Architectural Protocol // -typedef struct _EFI_BDS_ARCH_PROTOCOL { +struct _EFI_BDS_ARCH_PROTOCOL { EFI_BDS_ENTRY Entry; -} EFI_BDS_ARCH_PROTOCOL; +}; /*++ diff --git a/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/Cpu/Cpu.h b/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/Cpu/Cpu.h index c34aad4054..886f6be06b 100644 --- a/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/Cpu/Cpu.h +++ b/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/Cpu/Cpu.h @@ -304,7 +304,7 @@ Returns: --*/ -typedef struct _EFI_CPU_ARCH_PROTOCOL { +struct _EFI_CPU_ARCH_PROTOCOL { EFI_CPU_FLUSH_DATA_CACHE FlushDataCache; EFI_CPU_ENABLE_INTERRUPT EnableInterrupt; EFI_CPU_DISABLE_INTERRUPT DisableInterrupt; @@ -315,7 +315,7 @@ typedef struct _EFI_CPU_ARCH_PROTOCOL { EFI_CPU_SET_MEMORY_ATTRIBUTES SetMemoryAttributes; UINT32 NumberOfTimers; UINT32 DmaBufferAlignment; -} EFI_CPU_ARCH_PROTOCOL; +}; /*++ diff --git a/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/Metronome/Metronome.h b/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/Metronome/Metronome.h index 88de406d0e..8933609cf4 100644 --- a/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/Metronome/Metronome.h +++ b/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/Metronome/Metronome.h @@ -76,10 +76,10 @@ Returns: // // Interface stucture for the Metronome Architectural Protocol // -typedef struct _EFI_METRONOME_ARCH_PROTOCOL { +struct _EFI_METRONOME_ARCH_PROTOCOL { EFI_METRONOME_WAIT_FOR_TICK WaitForTick; UINT32 TickPeriod; -} EFI_METRONOME_ARCH_PROTOCOL; +}; /*++ diff --git a/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/Runtime/Runtime.h b/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/Runtime/Runtime.h index 62ea8b364a..5db1a829ae 100644 --- a/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/Runtime/Runtime.h +++ b/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/Runtime/Runtime.h @@ -46,27 +46,27 @@ Abstract: EFI_FORWARD_DECLARATION (EFI_RUNTIME_ARCH_PROTOCOL); -typedef struct _EFI_RUNTIME_IMAGE_ENTRY { +struct _EFI_RUNTIME_IMAGE_ENTRY { VOID *ImageBase; UINT64 ImageSize; VOID *RelocationData; EFI_HANDLE Handle; EFI_LIST_ENTRY Link; -} EFI_RUNTIME_IMAGE_ENTRY; +}; -typedef struct _EFI_RUNTIME_EVENT_ENTRY { +struct _EFI_RUNTIME_EVENT_ENTRY { UINT32 Type; EFI_TPL NotifyTpl; EFI_EVENT_NOTIFY NotifyFunction; VOID *NotifyContext; EFI_EVENT *Event; EFI_LIST_ENTRY Link; -} EFI_RUNTIME_EVENT_ENTRY; +}; // // Interface stucture for the Runtime Architectural Protocol // -typedef struct _EFI_RUNTIME_ARCH_PROTOCOL { +struct _EFI_RUNTIME_ARCH_PROTOCOL { EFI_LIST_ENTRY ImageHead; EFI_LIST_ENTRY EventHead; UINTN MemoryDescriptorSize; @@ -76,7 +76,7 @@ typedef struct _EFI_RUNTIME_ARCH_PROTOCOL { EFI_MEMORY_DESCRIPTOR *MemoryMapVirtual; BOOLEAN VirtualMode; BOOLEAN AtRuntime; -} EFI_RUNTIME_ARCH_PROTOCOL; +}; /*++ Protocol Description: diff --git a/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/Security/Security.h b/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/Security/Security.h index 483bc53377..29d0bca6d4 100644 --- a/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/Security/Security.h +++ b/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/Security/Security.h @@ -111,9 +111,9 @@ Returns: // // Interface stucture for the Timer Architectural Protocol // -typedef struct _EFI_SECURITY_ARCH_PROTOCOL { +struct _EFI_SECURITY_ARCH_PROTOCOL { EFI_SECURITY_FILE_AUTHENTICATION_STATE FileAuthenticationState; -} EFI_SECURITY_ARCH_PROTOCOL; +}; /*++ Protocol Description: diff --git a/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/StatusCode/StatusCode.h b/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/StatusCode/StatusCode.h index 86b7c66cbf..89ae20c370 100644 --- a/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/StatusCode/StatusCode.h +++ b/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/StatusCode/StatusCode.h @@ -78,9 +78,9 @@ Returns: // // Interface stucture for the STATUS CODE Architectural Protocol // -typedef struct _EFI_STATUS_CODE_PROTOCOL { +struct _EFI_STATUS_CODE_PROTOCOL { EFI_REPORT_STATUS_CODE ReportStatusCode; -} EFI_STATUS_CODE_PROTOCOL; +}; /*++ // Protocol Description: diff --git a/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/Timer/Timer.h b/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/Timer/Timer.h index 76ec85a7fe..cca275e408 100644 --- a/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/Timer/Timer.h +++ b/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/Timer/Timer.h @@ -215,12 +215,12 @@ Returns: // // Interface stucture for the Timer Architectural Protocol // -typedef struct _EFI_TIMER_ARCH_PROTOCOL { +struct _EFI_TIMER_ARCH_PROTOCOL { EFI_TIMER_REGISTER_HANDLER RegisterHandler; EFI_TIMER_SET_TIMER_PERIOD SetTimerPeriod; EFI_TIMER_GET_TIMER_PERIOD GetTimerPeriod; EFI_TIMER_GENERATE_SOFT_INTERRUPT GenerateSoftInterrupt; -} EFI_TIMER_ARCH_PROTOCOL; +}; /*++ diff --git a/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/WatchdogTimer/WatchdogTimer.h b/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/WatchdogTimer/WatchdogTimer.h index 4ebecfa369..8e4d1a2f0a 100644 --- a/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/WatchdogTimer/WatchdogTimer.h +++ b/EdkCompatibilityPkg/Foundation/Core/Dxe/ArchProtocol/WatchdogTimer/WatchdogTimer.h @@ -166,11 +166,11 @@ Returns: // // Interface stucture for the Watchdog Timer Architectural Protocol // -typedef struct _EFI_WATCHDOG_TIMER_ARCH_PROTOCOL { +struct _EFI_WATCHDOG_TIMER_ARCH_PROTOCOL { EFI_WATCHDOG_TIMER_REGISTER_HANDLER RegisterHandler; EFI_WATCHDOG_TIMER_SET_TIMER_PERIOD SetTimerPeriod; EFI_WATCHDOG_TIMER_GET_TIMER_PERIOD GetTimerPeriod; -} EFI_WATCHDOG_TIMER_ARCH_PROTOCOL; +}; /*++ -- cgit v1.2.3