From 93b0fbc8a1731a3c4ae789bebac4b1d8966719c3 Mon Sep 17 00:00:00 2001 From: vanjeff Date: Mon, 25 Jun 2007 08:54:54 +0000 Subject: Add some definitions for efi event in Uefi/UefiSpec.h to follow spec. Changed old event definitions reference to these new event definitions. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2729 6f19259b-4bc3-4df7-8a09-765794883524 --- EdkModulePkg/Core/Dxe/Dispatcher/Dispatcher.c | 4 +- EdkModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c | 4 +- EdkModulePkg/Core/Dxe/Event/event.c | 46 +++++------ EdkModulePkg/Core/Dxe/Event/execdata.c | 6 +- EdkModulePkg/Core/Dxe/Event/timer.c | 42 +++++----- EdkModulePkg/Core/Dxe/Event/tpl.c | 10 +-- EdkModulePkg/Core/Dxe/Exec.h | 2 +- EdkModulePkg/Core/Dxe/FwVol/FwVol.c | 2 +- EdkModulePkg/Core/Dxe/Gcd/gcd.c | 4 +- EdkModulePkg/Core/Dxe/Hand/handle.c | 4 +- EdkModulePkg/Core/Dxe/Image/Image.c | 6 +- EdkModulePkg/Core/Dxe/Library/Library.c | 94 +++++++++++----------- EdkModulePkg/Core/Dxe/Mem/memdata.c | 2 +- .../Dxe/SectionExtraction/CoreSectionExtraction.c | 8 +- 14 files changed, 117 insertions(+), 117 deletions(-) (limited to 'EdkModulePkg/Core') diff --git a/EdkModulePkg/Core/Dxe/Dispatcher/Dispatcher.c b/EdkModulePkg/Core/Dxe/Dispatcher/Dispatcher.c index e6e1e6c1bd..9792a16485 100644 --- a/EdkModulePkg/Core/Dxe/Dispatcher/Dispatcher.c +++ b/EdkModulePkg/Core/Dxe/Dispatcher/Dispatcher.c @@ -66,7 +66,7 @@ LIST_ENTRY mFvHandleList = INITIALIZE_LIST_HEAD_VARIABLE (mFvHandleList); // // Lock for mDiscoveredList, mScheduledQueue, gDispatcherRunning. // -EFI_LOCK mDispatcherLock = EFI_INITIALIZE_LOCK_VARIABLE (EFI_TPL_HIGH_LEVEL); +EFI_LOCK mDispatcherLock = EFI_INITIALIZE_LOCK_VARIABLE (TPL_HIGH_LEVEL); // @@ -1126,7 +1126,7 @@ Returns: { mFwVolEvent = CoreCreateProtocolNotifyEvent ( &gEfiFirmwareVolumeProtocolGuid, - EFI_TPL_CALLBACK, + TPL_CALLBACK, CoreFwVolEventProtocolNotify, NULL, &mFwVolEventRegistration, diff --git a/EdkModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c b/EdkModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c index 8f389d02b4..5c9a5b8e89 100644 --- a/EdkModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c +++ b/EdkModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c @@ -216,8 +216,8 @@ Returns: // Create the event // Status = CoreCreateEvent ( - EFI_EVENT_NOTIFY_SIGNAL, - EFI_TPL_CALLBACK, + EVT_NOTIFY_SIGNAL, + TPL_CALLBACK, GenericArchProtocolNotify, NULL, &Entry->Event diff --git a/EdkModulePkg/Core/Dxe/Event/event.c b/EdkModulePkg/Core/Dxe/Event/event.c index 8f2934e711..b3ba71de81 100644 --- a/EdkModulePkg/Core/Dxe/Event/event.c +++ b/EdkModulePkg/Core/Dxe/Event/event.c @@ -30,30 +30,30 @@ UINT32 mEventTable[] = { // 0x80000200 Timer event with a notification function that is // queue when the event is signaled with SignalEvent() // - EFI_EVENT_TIMER | EFI_EVENT_NOTIFY_SIGNAL, + EVT_TIMER | EVT_NOTIFY_SIGNAL, // // 0x80000000 Timer event without a notification function. It can be // signaled with SignalEvent() and checked with CheckEvent() or WaitForEvent(). // - EFI_EVENT_TIMER, + EVT_TIMER, // // 0x00000100 Generic event with a notification function that // can be waited on with CheckEvent() or WaitForEvent() // - EFI_EVENT_NOTIFY_WAIT, + EVT_NOTIFY_WAIT, // // 0x00000200 Generic event with a notification function that // is queue when the event is signaled with SignalEvent() // - EFI_EVENT_NOTIFY_SIGNAL, + EVT_NOTIFY_SIGNAL, // // 0x00000201 ExitBootServicesEvent. // - EFI_EVENT_SIGNAL_EXIT_BOOT_SERVICES, + EVT_SIGNAL_EXIT_BOOT_SERVICES, // // 0x60000202 SetVirtualAddressMapEvent. // - EFI_EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE, + EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE, // // 0x00000000 Generic event without a notification function. @@ -65,7 +65,7 @@ UINT32 mEventTable[] = { // 0x80000100 Timer event with a notification function that can be // waited on with CheckEvent() or WaitForEvent() // - EFI_EVENT_TIMER | EFI_EVENT_NOTIFY_WAIT, + EVT_TIMER | EVT_NOTIFY_WAIT, }; STATIC @@ -139,7 +139,7 @@ Returns: { UINTN Index; - for (Index=0; Index <= EFI_TPL_HIGH_LEVEL; Index++) { + for (Index=0; Index <= TPL_HIGH_LEVEL; Index++) { InitializeListHead (&gEventQueue[Index]); } @@ -190,7 +190,7 @@ Returns: // Only clear the SIGNAL status if it is a SIGNAL type event. // WAIT type events are only cleared in CheckEvent() // - if (Event->Type & EFI_EVENT_NOTIFY_SIGNAL) { + if (Event->Type & EVT_NOTIFY_SIGNAL) { Event->SignalCount = 0; } @@ -332,9 +332,9 @@ Returns: // // Convert EFI 1.10 Events to thier UEFI 2.0 CreateEventEx mapping // - if (Type == EVENT_SIGNAL_EXIT_BOOT_SERVICES) { + if (Type == EVT_SIGNAL_EXIT_BOOT_SERVICES) { GuidPtr = &gEfiEventExitBootServicesGuid; - } else if (Type == EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE) { + } else if (Type == EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE) { GuidPtr = &gEfiEventVirtualAddressChangeGuid; } @@ -378,7 +378,7 @@ Returns: INTN Index; - if ((Event == NULL) || (NotifyTpl == EFI_TPL_APPLICATION)) { + if ((Event == NULL) || (NotifyTpl == TPL_APPLICATION)) { return EFI_INVALID_PARAMETER; } @@ -399,13 +399,13 @@ Returns: // // If it's a notify type of event, check its parameters // - if ((Type & (EFI_EVENT_NOTIFY_WAIT | EFI_EVENT_NOTIFY_SIGNAL))) { + if ((Type & (EVT_NOTIFY_WAIT | EVT_NOTIFY_SIGNAL))) { // // Check for an invalid NotifyFunction or NotifyTpl // if ((NotifyFunction == NULL) || - (NotifyTpl < EFI_TPL_APPLICATION) || - (NotifyTpl >= EFI_TPL_HIGH_LEVEL)) { + (NotifyTpl < TPL_APPLICATION) || + (NotifyTpl >= TPL_HIGH_LEVEL)) { return EFI_INVALID_PARAMETER; } @@ -422,7 +422,7 @@ Returns: // Allcoate and initialize a new event structure. // Status = CoreAllocatePool ( - (Type & EFI_EVENT_RUNTIME) ? EfiRuntimeServicesData: EfiBootServicesData, + (Type & EVT_RUNTIME) ? EfiRuntimeServicesData: EfiBootServicesData, sizeof (IEVENT), (VOID **)&IEvent ); @@ -445,7 +445,7 @@ Returns: *Event = IEvent; - if (Type & EFI_EVENT_RUNTIME) { + if (Type & EVT_RUNTIME) { // // Keep a list of all RT events so we can tell the RT AP. // @@ -459,7 +459,7 @@ Returns: CoreAcquireEventLock (); - if ((Type & EFI_EVENT_NOTIFY_SIGNAL) != 0x00000000) { + if ((Type & EVT_NOTIFY_SIGNAL) != 0x00000000) { // // The Event's NotifyFunction must be queued whenever the event is signaled // @@ -523,7 +523,7 @@ Returns: // // If signalling type is a notify function, queue it // - if (Event->Type & EFI_EVENT_NOTIFY_SIGNAL) { + if (Event->Type & EVT_NOTIFY_SIGNAL) { if (Event->ExFlag) { // // The CreateEventEx() style requires all members of the Event Group @@ -580,13 +580,13 @@ Returns: return EFI_INVALID_PARAMETER; } - if (Event->Type & EFI_EVENT_NOTIFY_SIGNAL) { + if (Event->Type & EVT_NOTIFY_SIGNAL) { return EFI_INVALID_PARAMETER; } Status = EFI_NOT_READY; - if (!Event->SignalCount && (Event->Type & EFI_EVENT_NOTIFY_WAIT)) { + if (!Event->SignalCount && (Event->Type & EVT_NOTIFY_WAIT)) { // // Queue the wait notify function @@ -654,7 +654,7 @@ Returns: // // Can only WaitForEvent at TPL_APPLICATION // - if (gEfiCurrentTpl != EFI_TPL_APPLICATION) { + if (gEfiCurrentTpl != TPL_APPLICATION) { return EFI_UNSUPPORTED; } @@ -721,7 +721,7 @@ Returns: // // If it's a timer event, make sure it's not pending // - if (Event->Type & EFI_EVENT_TIMER) { + if (Event->Type & EVT_TIMER) { CoreSetTimer (Event, TimerCancel, 0); } diff --git a/EdkModulePkg/Core/Dxe/Event/execdata.c b/EdkModulePkg/Core/Dxe/Event/execdata.c index 6e9b68b8be..a6d388ac21 100644 --- a/EdkModulePkg/Core/Dxe/Event/execdata.c +++ b/EdkModulePkg/Core/Dxe/Event/execdata.c @@ -28,19 +28,19 @@ Revision History // // gTpl - Task priority level // -EFI_TPL gEfiCurrentTpl = EFI_TPL_APPLICATION; +EFI_TPL gEfiCurrentTpl = TPL_APPLICATION; // // gEventQueueLock - Protects the event queus // -EFI_LOCK gEventQueueLock = EFI_INITIALIZE_LOCK_VARIABLE (EFI_TPL_HIGH_LEVEL); +EFI_LOCK gEventQueueLock = EFI_INITIALIZE_LOCK_VARIABLE (TPL_HIGH_LEVEL); // // gEventQueue - A list of event's to notify for each priority level // gEventPending - A bitmask of the EventQueues that are pending // -LIST_ENTRY gEventQueue[EFI_TPL_HIGH_LEVEL + 1]; +LIST_ENTRY gEventQueue[TPL_HIGH_LEVEL + 1]; UINTN gEventPending = 0; diff --git a/EdkModulePkg/Core/Dxe/Event/timer.c b/EdkModulePkg/Core/Dxe/Event/timer.c index a49701519e..0f886f96d3 100644 --- a/EdkModulePkg/Core/Dxe/Event/timer.c +++ b/EdkModulePkg/Core/Dxe/Event/timer.c @@ -1,16 +1,16 @@ /*++ -Copyright (c) 2006, 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 -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +Copyright (c) 2006, 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 +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. Module Name: - + timer.c Abstract: @@ -52,10 +52,10 @@ CoreInsertEventTimer ( // static LIST_ENTRY mEfiTimerList = INITIALIZE_LIST_HEAD_VARIABLE (mEfiTimerList); -static EFI_LOCK mEfiTimerLock = EFI_INITIALIZE_LOCK_VARIABLE (EFI_TPL_HIGH_LEVEL - 1); +static EFI_LOCK mEfiTimerLock = EFI_INITIALIZE_LOCK_VARIABLE (TPL_HIGH_LEVEL - 1); static EFI_EVENT mEfiCheckTimerEvent; -static EFI_LOCK mEfiSystemTimeLock = EFI_INITIALIZE_LOCK_VARIABLE (EFI_TPL_HIGH_LEVEL); +static EFI_LOCK mEfiSystemTimeLock = EFI_INITIALIZE_LOCK_VARIABLE (TPL_HIGH_LEVEL); static UINT64 mEfiSystemTime = 0; // @@ -75,7 +75,7 @@ Routine Description: Arguments: None - + Returns: None @@ -85,8 +85,8 @@ Returns: EFI_STATUS Status; Status = CoreCreateEvent ( - EFI_EVENT_NOTIFY_SIGNAL, - EFI_TPL_HIGH_LEVEL - 1, + EVT_NOTIFY_SIGNAL, + TPL_HIGH_LEVEL - 1, CoreCheckTimers, NULL, &mEfiCheckTimerEvent @@ -108,7 +108,7 @@ Routine Description: Arguments: None - + Returns: Returns the current system time @@ -137,7 +137,7 @@ Routine Description: Arguments: Duration - The number of 100ns elasped since the last call to TimerTick - + Returns: None @@ -331,16 +331,16 @@ Arguments: UserEvent - The timer event that is to be signaled at the specified time Type - The type of time that is specified in TriggerTime TriggerTime - The number of 100ns units until the timer expires - + Returns: EFI_SUCCESS - The event has been set to be signaled at the requested time EFI_INVALID_PARAMETER - Event or Type is not valid ---*/ +--*/ { IEVENT *Event; - + Event = UserEvent; if (Event == NULL) { @@ -351,10 +351,10 @@ Returns: return EFI_INVALID_PARAMETER; } - if (Type < 0 || Type > TimerRelative || !(Event->Type & EFI_EVENT_TIMER)) { + if (Type < 0 || Type > TimerRelative || !(Event->Type & EVT_TIMER)) { return EFI_INVALID_PARAMETER; } - + CoreAcquireLock (&mEfiTimerLock); // diff --git a/EdkModulePkg/Core/Dxe/Event/tpl.c b/EdkModulePkg/Core/Dxe/Event/tpl.c index ae851638af..437665faed 100644 --- a/EdkModulePkg/Core/Dxe/Event/tpl.c +++ b/EdkModulePkg/Core/Dxe/Event/tpl.c @@ -118,7 +118,7 @@ Returns: // // If raising to high level, disable interrupts // - if (NewTpl >= EFI_TPL_HIGH_LEVEL && OldTpl < EFI_TPL_HIGH_LEVEL) { + if (NewTpl >= TPL_HIGH_LEVEL && OldTpl < TPL_HIGH_LEVEL) { CoreSetInterruptState (FALSE); } @@ -165,8 +165,8 @@ Returns: // interrupts are enabled // - if (OldTpl >= EFI_TPL_HIGH_LEVEL && NewTpl < EFI_TPL_HIGH_LEVEL) { - gEfiCurrentTpl = EFI_TPL_HIGH_LEVEL; + if (OldTpl >= TPL_HIGH_LEVEL && NewTpl < TPL_HIGH_LEVEL) { + gEfiCurrentTpl = TPL_HIGH_LEVEL; } // @@ -175,7 +175,7 @@ Returns: while ((-2 << NewTpl) & gEventPending) { gEfiCurrentTpl = CoreHighestSetBit (gEventPending); - if (gEfiCurrentTpl < EFI_TPL_HIGH_LEVEL) { + if (gEfiCurrentTpl < TPL_HIGH_LEVEL) { CoreSetInterruptState (TRUE); } CoreDispatchEventNotifies (gEfiCurrentTpl); @@ -191,7 +191,7 @@ Returns: // If lowering below HIGH_LEVEL, make sure // interrupts are enabled // - if (gEfiCurrentTpl < EFI_TPL_HIGH_LEVEL) { + if (gEfiCurrentTpl < TPL_HIGH_LEVEL) { CoreSetInterruptState (TRUE); } diff --git a/EdkModulePkg/Core/Dxe/Exec.h b/EdkModulePkg/Core/Dxe/Exec.h index 376c381459..5df700113d 100644 --- a/EdkModulePkg/Core/Dxe/Exec.h +++ b/EdkModulePkg/Core/Dxe/Exec.h @@ -22,7 +22,7 @@ Abstract: #ifndef _EXEC_H_ #define _EXEC_H_ -#define VALID_TPL(a) ((a) <= EFI_TPL_HIGH_LEVEL) +#define VALID_TPL(a) ((a) <= TPL_HIGH_LEVEL) // // EFI_EVENT diff --git a/EdkModulePkg/Core/Dxe/FwVol/FwVol.c b/EdkModulePkg/Core/Dxe/FwVol/FwVol.c index 2e92a8b921..a73a1251e4 100644 --- a/EdkModulePkg/Core/Dxe/FwVol/FwVol.c +++ b/EdkModulePkg/Core/Dxe/FwVol/FwVol.c @@ -536,7 +536,7 @@ Returns: { gEfiFwVolBlockEvent = CoreCreateProtocolNotifyEvent ( &gEfiFirmwareVolumeBlockProtocolGuid, - EFI_TPL_CALLBACK, + TPL_CALLBACK, NotifyFwVolBlock, NULL, &gEfiFwVolBlockNotifyReg, diff --git a/EdkModulePkg/Core/Dxe/Gcd/gcd.c b/EdkModulePkg/Core/Dxe/Gcd/gcd.c index 181cb1a317..be3dbdd959 100644 --- a/EdkModulePkg/Core/Dxe/Gcd/gcd.c +++ b/EdkModulePkg/Core/Dxe/Gcd/gcd.c @@ -48,8 +48,8 @@ Abstract: // // Module Variables // -EFI_LOCK mGcdMemorySpaceLock = EFI_INITIALIZE_LOCK_VARIABLE (EFI_TPL_NOTIFY); -EFI_LOCK mGcdIoSpaceLock = EFI_INITIALIZE_LOCK_VARIABLE (EFI_TPL_NOTIFY); +EFI_LOCK mGcdMemorySpaceLock = EFI_INITIALIZE_LOCK_VARIABLE (TPL_NOTIFY); +EFI_LOCK mGcdIoSpaceLock = EFI_INITIALIZE_LOCK_VARIABLE (TPL_NOTIFY); LIST_ENTRY mGcdMemorySpaceMap = INITIALIZE_LIST_HEAD_VARIABLE (mGcdMemorySpaceMap); LIST_ENTRY mGcdIoSpaceMap = INITIALIZE_LIST_HEAD_VARIABLE (mGcdIoSpaceMap); diff --git a/EdkModulePkg/Core/Dxe/Hand/handle.c b/EdkModulePkg/Core/Dxe/Hand/handle.c index dd0801a96f..42d96ff465 100644 --- a/EdkModulePkg/Core/Dxe/Hand/handle.c +++ b/EdkModulePkg/Core/Dxe/Hand/handle.c @@ -34,7 +34,7 @@ Revision History // static LIST_ENTRY mProtocolDatabase = INITIALIZE_LIST_HEAD_VARIABLE (mProtocolDatabase); LIST_ENTRY gHandleList = INITIALIZE_LIST_HEAD_VARIABLE (gHandleList); -EFI_LOCK gProtocolDatabaseLock = EFI_INITIALIZE_LOCK_VARIABLE (EFI_TPL_NOTIFY); +EFI_LOCK gProtocolDatabaseLock = EFI_INITIALIZE_LOCK_VARIABLE (TPL_NOTIFY); UINT64 gHandleDatabaseKey = 0; @@ -632,7 +632,7 @@ Returns: // // Syncronize with notifcations. // - OldTpl = CoreRaiseTpl (EFI_TPL_NOTIFY); + OldTpl = CoreRaiseTpl (TPL_NOTIFY); OldHandle = *Handle; // diff --git a/EdkModulePkg/Core/Dxe/Image/Image.c b/EdkModulePkg/Core/Dxe/Image/Image.c index 901182e511..daf5fd180b 100644 --- a/EdkModulePkg/Core/Dxe/Image/Image.c +++ b/EdkModulePkg/Core/Dxe/Image/Image.c @@ -576,7 +576,7 @@ Returns: SecurityStatus = EFI_SUCCESS; - ASSERT (gEfiCurrentTpl < EFI_TPL_NOTIFY); + ASSERT (gEfiCurrentTpl < TPL_NOTIFY); ParentImage = NULL; // @@ -1224,7 +1224,7 @@ Returns: // Prevent possible reentrance to this function // for the same ImageHandle // - OldTpl = CoreRaiseTpl (EFI_TPL_NOTIFY); + OldTpl = CoreRaiseTpl (TPL_NOTIFY); Image = CoreLoadedImageInfo (ImageHandle); if (Image == NULL_HANDLE) { @@ -1317,7 +1317,7 @@ Returns: // Prevent possible reentrance to this function // for the same ImageHandle // - OldTpl = CoreRaiseTpl (EFI_TPL_NOTIFY); + OldTpl = CoreRaiseTpl (TPL_NOTIFY); Image = CoreLoadedImageInfo (ImageHandle); if (Image == NULL ) { diff --git a/EdkModulePkg/Core/Dxe/Library/Library.c b/EdkModulePkg/Core/Dxe/Library/Library.c index 74d873e3f8..3d8a312cc2 100644 --- a/EdkModulePkg/Core/Dxe/Library/Library.c +++ b/EdkModulePkg/Core/Dxe/Library/Library.c @@ -1,13 +1,13 @@ /*++ -Copyright (c) 2006, 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 -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +Copyright (c) 2006, 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 +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. Module Name: @@ -41,16 +41,16 @@ CoreReportProgressCodeSpecific ( Routine Description: - Report status code of type EFI_PROGRESS_CODE by caller ID gEfiDxeServicesTableGuid, + Report status code of type EFI_PROGRESS_CODE by caller ID gEfiDxeServicesTableGuid, with a handle as additional information. - + Arguments: - Value - Describes the class/subclass/operation of the hardware or software entity - that the Status Code relates to. - + Value - Describes the class/subclass/operation of the hardware or software entity + that the Status Code relates to. + Handle - Additional information. - + Returns: None @@ -80,12 +80,12 @@ CoreReportProgressCode ( Routine Description: Report status code of type EFI_PROGRESS_CODE by caller ID gEfiDxeServicesTableGuid. - + Arguments: - Value - Describes the class/subclass/operation of the hardware or software entity - that the Status Code relates to. - + Value - Describes the class/subclass/operation of the hardware or software entity + that the Status Code relates to. + Returns: None @@ -113,11 +113,11 @@ CoreAllocateBootServicesPool ( Routine Description: Allocate pool of type EfiBootServicesData, the size is specified with AllocationSize. - + Arguments: AllocationSize - Size to allocate. - + Returns: Pointer of the allocated pool. @@ -140,11 +140,11 @@ CoreAllocateZeroBootServicesPool ( Routine Description: Allocate pool of type EfiBootServicesData and zero it, the size is specified with AllocationSize. - + Arguments: AllocationSize - Size to allocate. - + Returns: Pointer of the allocated pool. @@ -169,13 +169,13 @@ CoreAllocateCopyPool ( Routine Description: Allocate pool of specified size with EfiBootServicesData type, and copy specified buffer to this pool. - + Arguments: AllocationSize - Size to allocate. - + Buffer - Specified buffer that will be copy to the allocated pool - + Returns: Pointer of the allocated pool. @@ -186,11 +186,11 @@ Returns: Memory = CoreAllocateBootServicesPool (AllocationSize); CopyMem (Memory, Buffer, (Memory == NULL) ? 0 : AllocationSize); - + return Memory; } - + VOID * CoreAllocateRuntimePool ( @@ -201,11 +201,11 @@ CoreAllocateRuntimePool ( Routine Description: Allocate pool of type EfiRuntimeServicesData, the size is specified with AllocationSize. - + Arguments: AllocationSize - Size to allocate. - + Returns: Pointer of the allocated pool. @@ -228,13 +228,13 @@ CoreAllocateRuntimeCopyPool ( Routine Description: Allocate pool of specified size with EfiRuntimeServicesData type, and copy specified buffer to this pool. - + Arguments: AllocationSize - Size to allocate. - + Buffer - Specified buffer that will be copy to the allocated pool - + Returns: Pointer of the allocated pool. @@ -246,7 +246,7 @@ Returns: Memory = CoreAllocateRuntimePool (AllocationSize); CopyMem (Memory, Buffer, (Memory == NULL) ? 0 : AllocationSize); - + return Memory; } @@ -271,11 +271,11 @@ Routine Description: level. Since there is no-premption (at any TPL) or multiprocessor support, acquiring the lock only consists of raising to the locks TPL. - + Arguments: Lock - The EFI_LOCK structure to initialize - + Returns: EFI_SUCCESS - Lock Owned. @@ -310,11 +310,11 @@ Routine Description: Raising to the task priority level of the mutual exclusion lock, and then acquires ownership of the lock. - + Arguments: Lock - The lock to acquire - + Returns: Lock owned @@ -339,11 +339,11 @@ Routine Description: Releases ownership of the mutual exclusion lock, and restores the previous task priority level. - + Arguments: Lock - The lock to release - + Returns: Lock unowned @@ -356,7 +356,7 @@ Returns: ASSERT (Lock->Lock == EfiLockAcquired); Tpl = Lock->OwnerTpl; - + Lock->Lock = EfiLockReleased; CoreRestoreTpl (Tpl); @@ -371,12 +371,12 @@ CoreDevicePathSize ( Routine Description: - Calculate the size of a whole device path. - + Calculate the size of a whole device path. + Arguments: DevicePath - The pointer to the device path data. - + Returns: Size of device path data structure.. @@ -513,7 +513,7 @@ Returns: if (Src1 == NULL && Src2 == NULL) { return NULL; } - + // // Allocate space for the combined device path. It only has one end node of // length EFI_DEVICE_PATH_PROTOCOL @@ -564,7 +564,7 @@ Arguments: Registration - Registration key returned from RegisterProtocolNotify(). - SignalFlag - Boolean value to decide whether kick the event after register or not. + SignalFlag - Boolean value to decide whether kick the event after register or not. Returns: @@ -581,11 +581,11 @@ Returns: // Status = CoreCreateEvent ( - EFI_EVENT_NOTIFY_SIGNAL, + EVT_NOTIFY_SIGNAL, NotifyTpl, NotifyFunction, NotifyContext, - &Event + &Event ); ASSERT_EFI_ERROR (Status); diff --git a/EdkModulePkg/Core/Dxe/Mem/memdata.c b/EdkModulePkg/Core/Dxe/Mem/memdata.c index 2fa4843102..83a130dee3 100644 --- a/EdkModulePkg/Core/Dxe/Mem/memdata.c +++ b/EdkModulePkg/Core/Dxe/Mem/memdata.c @@ -28,7 +28,7 @@ Revision History // // MemoryLock - synchronizes access to the memory map and pool lists // -EFI_LOCK gMemoryLock = EFI_INITIALIZE_LOCK_VARIABLE (EFI_TPL_NOTIFY); +EFI_LOCK gMemoryLock = EFI_INITIALIZE_LOCK_VARIABLE (TPL_NOTIFY); // // MemoryMap - the current memory map diff --git a/EdkModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c b/EdkModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c index a3e20e69e8..817dbd8fb8 100644 --- a/EdkModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c +++ b/EdkModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c @@ -383,7 +383,7 @@ Returns: UINTN SectionSize; - OldTpl = CoreRaiseTpl (EFI_TPL_NOTIFY); + OldTpl = CoreRaiseTpl (TPL_NOTIFY); Instance = SectionInstance + 1; // @@ -484,7 +484,7 @@ Returns: LIST_ENTRY *Link; CORE_SECTION_CHILD_NODE *ChildNode; - OldTpl = CoreRaiseTpl (EFI_TPL_NOTIFY); + OldTpl = CoreRaiseTpl (TPL_NOTIFY); // // Locate target stream @@ -1025,7 +1025,7 @@ Returns: Context->Event = CoreCreateProtocolNotifyEvent ( Context->ChildNode->EncapsulationGuid, - EFI_TPL_NOTIFY, + TPL_NOTIFY, NotifyGuidedExtraction, Context, &Context->Registration, @@ -1234,7 +1234,7 @@ OpenSectionStreamEx ( // // Add new stream to stream list // - OldTpl = CoreRaiseTpl (EFI_TPL_NOTIFY); + OldTpl = CoreRaiseTpl (TPL_NOTIFY); InsertTailList (&mStreamRoot, &NewStream->Link); CoreRestoreTpl (OldTpl); -- cgit v1.2.3