From 1ccdbf2a3e61fe9494fcd39432107ba0eb74f584 Mon Sep 17 00:00:00 2001 From: rsun3 Date: Tue, 19 Jan 2010 06:42:21 +0000 Subject: Improve coding style in MdeModulePkg. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9793 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Universal/DebugSupportDxe/Ia32/DebugSupport.h | 13 +++++++++---- .../Universal/DebugSupportDxe/Ia32/PlDebugSupport.c | 4 ++-- .../Universal/DebugSupportDxe/Ia32/PlDebugSupportIa32.c | 4 ++-- .../Universal/DebugSupportDxe/Ipf/PlDebugSupport.c | 14 +++++++------- .../Universal/DebugSupportDxe/Ipf/PlDebugSupport.h | 17 +++++++++++------ .../Universal/DebugSupportDxe/X64/PlDebugSupportX64.c | 4 ++-- 6 files changed, 33 insertions(+), 23 deletions(-) (limited to 'MdeModulePkg/Universal/DebugSupportDxe') diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/DebugSupport.h b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/DebugSupport.h index 4628117b09..c384ba1a40 100644 --- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/DebugSupport.h +++ b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/DebugSupport.h @@ -1,7 +1,7 @@ /** @file Generic debug support macros, typedefs and prototypes for IA32/x64. -Copyright (c) 2006 - 2009, Intel Corporation +Copyright (c) 2006 - 2010, Intel Corporation All rights reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -37,12 +37,17 @@ VOID VOID ); +typedef +VOID +(EFIAPI *CALLBACK_FUNC) ( + ); + typedef struct { IA32_IDT_GATE_DESCRIPTOR OrigDesc; DEBUG_PROC OrigVector; IA32_IDT_GATE_DESCRIPTOR NewDesc; DEBUG_PROC StubEntry; - VOID (EFIAPI *RegisteredCallback) (); + CALLBACK_FUNC RegisteredCallback; } IDT_ENTRY; extern UINT8 InterruptEntryStub[]; @@ -258,7 +263,7 @@ GetInterruptHandleFromIdt ( **/ EFI_STATUS ManageIdtEntryTable ( - VOID (EFIAPI *NewCallback)(), + CALLBACK_FUNC NewCallback, EFI_EXCEPTION_TYPE ExceptionType ); @@ -277,7 +282,7 @@ ManageIdtEntryTable ( VOID HookEntry ( IN EFI_EXCEPTION_TYPE ExceptionType, - IN VOID (EFIAPI *NewCallback) () + IN CALLBACK_FUNC NewCallback ); /** diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.c b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.c index b9a57142ee..c78285a60e 100644 --- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.c +++ b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupport.c @@ -1,7 +1,7 @@ /** @file IA32/x64 generic functions to support Debug Support protocol. -Copyright (c) 2006 - 2009, Intel Corporation +Copyright (c) 2006 - 2010, Intel Corporation All rights reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -78,7 +78,7 @@ WriteIdtGateDescriptor ( VOID HookEntry ( IN EFI_EXCEPTION_TYPE ExceptionType, - IN VOID (EFIAPI *NewCallback) () + IN CALLBACK_FUNC NewCallback ) { BOOLEAN OldIntFlagState; diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupportIa32.c b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupportIa32.c index ab8d9a94f1..fa1553e00c 100644 --- a/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupportIa32.c +++ b/MdeModulePkg/Universal/DebugSupportDxe/Ia32/PlDebugSupportIa32.c @@ -1,7 +1,7 @@ /** @file IA32 specific functions to support Debug Support protocol. -Copyright (c) 2008 - 2009, Intel Corporation +Copyright (c) 2008 - 2010, Intel Corporation All rights reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -107,7 +107,7 @@ CreateEntryStub ( **/ EFI_STATUS ManageIdtEntryTable ( - VOID (EFIAPI *NewCallback)(), + CALLBACK_FUNC NewCallback, EFI_EXCEPTION_TYPE ExceptionType ) { diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.c b/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.c index fa70100333..138a36c893 100644 --- a/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.c +++ b/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.c @@ -1,7 +1,7 @@ /** @file IPF specific functions to support Debug Support protocol. -Copyright (c) 2006 - 2008, Intel Corporation +Copyright (c) 2006 - 2010, Intel Corporation All rights reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -23,8 +23,8 @@ BOOLEAN mInHandler = FALSE; #define NUM_IVT_ENTRIES 64 typedef struct { - BUNDLE OrigBundles[NUM_BUNDLES_IN_STUB]; - VOID (*RegisteredCallback) (); + BUNDLE OrigBundles[NUM_BUNDLES_IN_STUB]; + CALLBACK_FUNC RegisteredCallback; } IVT_ENTRY; IVT_ENTRY IvtEntryTable[NUM_IVT_ENTRIES]; @@ -183,7 +183,7 @@ EFI_STATUS ManageIvtEntryTable ( IN EFI_EXCEPTION_TYPE ExceptionType, IN BUNDLE NewBundles[NUM_BUNDLES_IN_STUB], - IN VOID (*NewCallback) () + IN CALLBACK_FUNC NewCallback ) { BUNDLE *B0Ptr; @@ -257,7 +257,7 @@ VOID HookEntry ( IN EFI_EXCEPTION_TYPE ExceptionType, IN BUNDLE NewBundles[4], - IN VOID (*NewCallback) () + IN CALLBACK_FUNC NewCallback ) { BUNDLE *FixupBundle; @@ -285,7 +285,7 @@ HookEntry ( // fixup IVT entry so it stores its index and whether or not to chain... // FixupBundle = B0Ptr + 2; - FixupBundle->high |= ExceptionType << 36; + FixupBundle->High |= ExceptionType << 36; InstructionCacheFlush (B0Ptr, 5); IvtEntryTable[ExceptionType].RegisteredCallback = NewCallback; @@ -329,7 +329,7 @@ UnhookEntry ( **/ VOID ChainExternalInterrupt ( - IN VOID (*NewCallback) () + IN CALLBACK_FUNC NewCallback ) { VOID *Start; diff --git a/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.h b/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.h index 9f6bd3efdd..c1b384c9a3 100644 --- a/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.h +++ b/MdeModulePkg/Universal/DebugSupportDxe/Ipf/PlDebugSupport.h @@ -1,7 +1,7 @@ /** @file IPF specific types, macros, and definitions for Debug Support Driver. -Copyright (c) 2004 - 2008, Intel Corporation +Copyright (c) 2004 - 2010, Intel Corporation All rights reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -31,10 +31,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #define EFI_ISA IsaIpf typedef struct { - UINT64 low; - UINT64 high; + UINT64 Low; + UINT64 High; } BUNDLE; +typedef +VOID +(*CALLBACK_FUNC) ( + ); + /** IPF specific DebugSupport driver initialization. @@ -250,7 +255,7 @@ EFI_STATUS ManageIvtEntryTable ( IN EFI_EXCEPTION_TYPE ExceptionType, IN BUNDLE NewBundles[4], - IN VOID (*NewCallback) () + IN CALLBACK_FUNC NewCallback ); /** @@ -266,7 +271,7 @@ VOID HookEntry ( IN EFI_EXCEPTION_TYPE ExceptionType, IN BUNDLE NewBundles[4], - IN VOID (*NewCallback) () + IN CALLBACK_FUNC NewCallback ); /** @@ -290,7 +295,7 @@ UnhookEntry ( **/ VOID ChainExternalInterrupt ( - IN VOID (*NewCallback) () + IN CALLBACK_FUNC NewCallback ); /** diff --git a/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupportX64.c b/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupportX64.c index 4d13ca3833..76c1c99126 100644 --- a/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupportX64.c +++ b/MdeModulePkg/Universal/DebugSupportDxe/X64/PlDebugSupportX64.c @@ -1,7 +1,7 @@ /** @file X64 specific functions to support Debug Support protocol. -Copyright (c) 2008 - 2009, Intel Corporation +Copyright (c) 2008 - 2010, Intel Corporation All rights reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -108,7 +108,7 @@ CreateEntryStub ( **/ EFI_STATUS ManageIdtEntryTable ( - VOID (EFIAPI *NewCallback)(), + CALLBACK_FUNC NewCallback, EFI_EXCEPTION_TYPE ExceptionType ) { -- cgit v1.2.3