diff options
| author | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-06-25 08:54:54 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-06-25 08:54:54 +0000 |
| commit | 93b0fbc8a1731a3c4ae789bebac4b1d8966719c3 (patch) | |
| tree | 800e8a6512892d5de738f0c86bf8f5bc3ab9063b /EdkModulePkg/Universal | |
| parent | a197b1ad17703a117e5b67c50c311325a2b3bdcb (diff) | |
| download | edk2-93b0fbc8a1731a3c4ae789bebac4b1d8966719c3.tar.gz edk2-93b0fbc8a1731a3c4ae789bebac4b1d8966719c3.tar.bz2 edk2-93b0fbc8a1731a3c4ae789bebac4b1d8966719c3.zip | |
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
Diffstat (limited to 'EdkModulePkg/Universal')
26 files changed, 296 insertions, 296 deletions
diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c index bd18e25621..30ee71f763 100644 --- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c +++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c @@ -366,8 +366,8 @@ Returns: // Create Event to support locking StdIn Device
//
Status = gBS->CreateEvent (
- EFI_EVENT_TIMER | EFI_EVENT_NOTIFY_SIGNAL,
- EFI_TPL_CALLBACK,
+ EVT_TIMER | EVT_NOTIFY_SIGNAL,
+ TPL_CALLBACK,
ConSpliterConsoleControlLockStdInEvent,
NULL,
&ConInPrivate->LockEvent
@@ -375,8 +375,8 @@ Returns: ASSERT_EFI_ERROR (Status);
Status = gBS->CreateEvent (
- EFI_EVENT_NOTIFY_WAIT,
- EFI_TPL_NOTIFY,
+ EVT_NOTIFY_WAIT,
+ TPL_NOTIFY,
ConSplitterTextInWaitForKey,
ConInPrivate,
&ConInPrivate->TextIn.WaitForKey
@@ -395,8 +395,8 @@ Returns: }
Status = gBS->CreateEvent (
- EFI_EVENT_NOTIFY_WAIT,
- EFI_TPL_NOTIFY,
+ EVT_NOTIFY_WAIT,
+ TPL_NOTIFY,
ConSplitterSimplePointerWaitForInput,
ConInPrivate,
&ConInPrivate->SimplePointer.WaitForInput
diff --git a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c index 9de82ccf11..21cf9db54b 100644 --- a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c +++ b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c @@ -727,7 +727,7 @@ GraphicsConsoleConOutOutputString ( Status = EFI_SUCCESS;
- OldTpl = gBS->RaiseTPL (EFI_TPL_NOTIFY);
+ OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
//
// Current mode
//
@@ -1078,7 +1078,7 @@ GraphicsConsoleConOutQueryMode ( return EFI_UNSUPPORTED;
}
- OldTpl = gBS->RaiseTPL (EFI_TPL_NOTIFY);
+ OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
Status = EFI_SUCCESS;
Private = GRAPHICS_CONSOLE_CON_OUT_DEV_FROM_THIS (This);
@@ -1141,7 +1141,7 @@ GraphicsConsoleConOutSetMode ( UINT32 RefreshRate;
EFI_TPL OldTpl;
- OldTpl = gBS->RaiseTPL (EFI_TPL_NOTIFY);
+ OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
Private = GRAPHICS_CONSOLE_CON_OUT_DEV_FROM_THIS (This);
GraphicsOutput = Private->GraphicsOutput;
@@ -1343,7 +1343,7 @@ GraphicsConsoleConOutSetAttribute ( return EFI_SUCCESS;
}
- OldTpl = gBS->RaiseTPL (EFI_TPL_NOTIFY);
+ OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
EraseCursor (This);
@@ -1395,7 +1395,7 @@ GraphicsConsoleConOutClearScreen ( EFI_GRAPHICS_OUTPUT_BLT_PIXEL Background;
EFI_TPL OldTpl;
- OldTpl = gBS->RaiseTPL (EFI_TPL_NOTIFY);
+ OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
Private = GRAPHICS_CONSOLE_CON_OUT_DEV_FROM_THIS (This);
GraphicsOutput = Private->GraphicsOutput;
@@ -1482,7 +1482,7 @@ GraphicsConsoleConOutSetCursorPosition ( Status = EFI_SUCCESS;
- OldTpl = gBS->RaiseTPL (EFI_TPL_NOTIFY);
+ OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
Private = GRAPHICS_CONSOLE_CON_OUT_DEV_FROM_THIS (This);
ModeData = &(Private->ModeData[This->Mode->Mode]);
@@ -1541,7 +1541,7 @@ GraphicsConsoleConOutEnableCursor ( {
EFI_TPL OldTpl;
- OldTpl = gBS->RaiseTPL (EFI_TPL_NOTIFY);
+ OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
EraseCursor (This);
diff --git a/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.c b/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.c index ba113c27ad..958516db61 100644 --- a/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.c +++ b/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.c @@ -1,19 +1,19 @@ /*++
-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:
Terminal.c
-
-Abstract:
+
+Abstract:
Revision History:
@@ -289,10 +289,10 @@ TerminalDriverBindingStart ( Status = EFI_OUT_OF_RESOURCES;
goto Error;
}
-
+
CopyMem (&DefaultNode->Guid, &gEfiPcAnsiGuid, sizeof (EFI_GUID));
RemainingDevicePath = (EFI_DEVICE_PATH_PROTOCOL*) DefaultNode;
- }
+ }
//
// Use the RemainingDevicePath to determine the terminal type
//
@@ -341,8 +341,8 @@ TerminalDriverBindingStart ( TerminalDevice->SimpleInput.ReadKeyStroke = TerminalConInReadKeyStroke;
Status = gBS->CreateEvent (
- EFI_EVENT_NOTIFY_WAIT,
- EFI_TPL_NOTIFY,
+ EVT_NOTIFY_WAIT,
+ TPL_NOTIFY,
TerminalConInWaitForKey,
&TerminalDevice->SimpleInput,
&TerminalDevice->SimpleInput.WaitForKey
@@ -465,8 +465,8 @@ TerminalDriverBindingStart ( TerminalDevice->ResetState = RESET_STATE_DEFAULT;
Status = gBS->CreateEvent (
- EFI_EVENT_TIMER,
- EFI_TPL_CALLBACK,
+ EVT_TIMER,
+ TPL_CALLBACK,
NULL,
NULL,
&TerminalDevice->TwoSecondTimeOut
@@ -568,7 +568,7 @@ TerminalDriverBindingStart ( if (DefaultNode != NULL) {
FreePool (DefaultNode);
}
-
+
return EFI_SUCCESS;
ReportError:
@@ -614,7 +614,7 @@ Error: if (DefaultNode != NULL) {
FreePool (DefaultNode);
}
-
+
This->Stop (This, Controller, 0, NULL);
return Status;
@@ -883,9 +883,9 @@ TerminalRemoveConsoleDevVariable ( /*++
Routine Description:
-
+
Remove console device variable.
-
+
Arguments:
VariableName - A pointer to the variable name.
@@ -1022,7 +1022,7 @@ Returns: Caller is repsoncible freeing the buffer.
NULL - Variable was not read
-
+
--*/
{
EFI_STATUS Status;
diff --git a/EdkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.c b/EdkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.c index dd4a5a6b51..aa0cced530 100644 --- a/EdkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.c +++ b/EdkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.c @@ -632,7 +632,7 @@ Returns: InitializeListHead (&mPrivateData.DataListHead);
InitializeListHead (&mPrivateData.FilterDriverListHead);
- EfiInitializeLock (&mPrivateData.DataLock, EFI_TPL_NOTIFY);
+ EfiInitializeLock (&mPrivateData.DataLock, TPL_NOTIFY);
//
// Make sure we get a bigger MTC number on every boot!
diff --git a/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.c b/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.c index 1a392ab703..ac703fd09c 100644 --- a/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.c +++ b/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.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:
@@ -15,7 +15,7 @@ Module Name: Abstract:
- Data Hub filter driver that takes DEBUG () info from Data Hub and writes it
+ Data Hub filter driver that takes DEBUG () info from Data Hub and writes it
to StdErr if it exists.
--*/
@@ -42,7 +42,7 @@ Routine Description: Arguments:
Event - The event that occured, not used
Context - DataHub Protocol Pointer
-
+
Returns:
None.
@@ -119,9 +119,9 @@ Arguments: Returns:
EFI_SUCCESS - The event handler was registered.
- EFI_OUT_OF_RESOURCES - The event hadler was not registered due to lack of
+ EFI_OUT_OF_RESOURCES - The event hadler was not registered due to lack of
system resources.
-
+
--*/
{
EFI_STATUS Status;
@@ -137,8 +137,8 @@ Returns: // Create an event and register it with the filter driver
//
Status = gBS->CreateEvent (
- EFI_EVENT_NOTIFY_SIGNAL,
- EFI_TPL_CALLBACK,
+ EVT_NOTIFY_SIGNAL,
+ TPL_CALLBACK,
DataHubStdErrEventHandler,
mDataHub,
&mDataHubStdErrEvent
@@ -151,7 +151,7 @@ Returns: Status = mDataHub->RegisterFilterDriver (
mDataHub,
mDataHubStdErrEvent,
- EFI_TPL_CALLBACK,
+ TPL_CALLBACK,
DataClass,
NULL
);
diff --git a/EdkModulePkg/Universal/DebugSupport/Dxe/ipf/plDebugSupport.c b/EdkModulePkg/Universal/DebugSupport/Dxe/ipf/plDebugSupport.c index ca2a1e83d2..33233d68e5 100644 --- a/EdkModulePkg/Universal/DebugSupport/Dxe/ipf/plDebugSupport.c +++ b/EdkModulePkg/Universal/DebugSupport/Dxe/ipf/plDebugSupport.c @@ -285,7 +285,7 @@ Returns: //
// else remove the previously installed handler
//
- OldTpl = gBS->RaiseTPL (EFI_TPL_HIGH_LEVEL);
+ OldTpl = gBS->RaiseTPL (TPL_HIGH_LEVEL);
InterruptFlags = ProgramInterruptFlags (DISABLE_INTERRUPTS);
if (ExceptionType == EXCEPT_IPF_EXTERNAL_INTERRUPT) {
UnchainExternalInterrupt ();
@@ -305,7 +305,7 @@ Returns: // no user handler installed on this vector
//
if (NewCallback != NULL) {
- OldTpl = gBS->RaiseTPL (EFI_TPL_HIGH_LEVEL);
+ OldTpl = gBS->RaiseTPL (TPL_HIGH_LEVEL);
InterruptFlags = ProgramInterruptFlags (DISABLE_INTERRUPTS);
if (ExceptionType == EXCEPT_IPF_EXTERNAL_INTERRUPT) {
ChainExternalInterrupt (NewCallback);
diff --git a/EdkModulePkg/Universal/Ebc/Dxe/EbcInt.c b/EdkModulePkg/Universal/Ebc/Dxe/EbcInt.c index b42ff17056..2b647d9bae 100644 --- a/EdkModulePkg/Universal/Ebc/Dxe/EbcInt.c +++ b/EdkModulePkg/Universal/Ebc/Dxe/EbcInt.c @@ -1,24 +1,24 @@ /*++
-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
-Module Name:
+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:
EbcInt.c
-
+
Abstract:
Top level module for the EBC virtual machine implementation.
Provides auxilliary support routines for the VM. That is, routines
that are not particularly related to VM execution of EBC instructions.
-
+
--*/
#include "EbcInt.h"
@@ -196,17 +196,17 @@ InitializeEbcDriver ( )
/*++
-Routine Description:
+Routine Description:
- Initializes the VM EFI interface. Allocates memory for the VM interface
+ Initializes the VM EFI interface. Allocates memory for the VM interface
and registers the VM protocol.
-Arguments:
+Arguments:
ImageHandle - EFI image handle.
SystemTable - Pointer to the EFI system table.
-Returns:
+Returns:
Standard EFI status code.
--*/
@@ -396,9 +396,9 @@ EbcCreateThunk ( /*++
Routine Description:
-
+
This is the top-level routine plugged into the EBC protocol. Since thunks
- are very processor-specific, from here we dispatch directly to the very
+ are very processor-specific, from here we dispatch directly to the very
processor-specific routine EbcCreateThunks().
Arguments:
@@ -438,7 +438,7 @@ EbcDebugGetMaximumProcessorIndex ( /*++
Routine Description:
-
+
This EBC debugger protocol service is called by the debug agent
Arguments:
@@ -446,7 +446,7 @@ Arguments: This - pointer to the caller's debug support protocol interface
MaxProcessorIndex - pointer to a caller allocated UINTN in which the maximum
processor index is returned.
-
+
Returns:
Standard EFI_STATUS
@@ -468,10 +468,10 @@ EbcDebugRegisterPeriodicCallback ( /*++
Routine Description:
-
+
This protocol service is called by the debug agent to register a function
for us to call on a periodic basis.
-
+
Arguments:
@@ -490,7 +490,7 @@ Returns: if ((mDebugPeriodicCallback != NULL) && (PeriodicCallback != NULL)) {
return EFI_ALREADY_STARTED;
}
-
+
mDebugPeriodicCallback = PeriodicCallback;
return EFI_SUCCESS;
}
@@ -507,10 +507,10 @@ EbcDebugRegisterExceptionCallback ( /*++
Routine Description:
-
+
This protocol service is called by the debug agent to register a function
for us to call when we detect an exception.
-
+
Arguments:
@@ -548,12 +548,12 @@ EbcDebugInvalidateInstructionCache ( /*++
Routine Description:
-
+
This EBC debugger protocol service is called by the debug agent. Required
for DebugSupport compliance but is only stubbed out for EBC.
Arguments:
-
+
Returns:
EFI_SUCCESS
@@ -574,7 +574,7 @@ EbcDebugSignalException ( Routine Description:
The VM interpreter calls this function when an exception is detected.
-
+
Arguments:
VmPtr - pointer to a VM context for passing info to the EFI debugger.
@@ -582,7 +582,7 @@ Arguments: Returns:
EFI_SUCCESS if it returns at all
-
+
--*/
{
EFI_SYSTEM_CONTEXT_EBC EbcContext;
@@ -641,7 +641,7 @@ Returns: VmPtr->Ip = (VMIP)(UINTN)EbcContext.Ip;
VmPtr->Flags = EbcContext.Flags;
}
-
+
return EFI_SUCCESS;
}
@@ -655,7 +655,7 @@ InitializeEbcCallback ( Routine Description:
To install default Callback function for the VM interpreter.
-
+
Arguments:
This - pointer to the instance of DebugSupport protocol
@@ -663,7 +663,7 @@ Arguments: Returns:
None
-
+
--*/
{
INTN Index;
@@ -685,8 +685,8 @@ Returns: // For PeriodicCallback
//
Status = gBS->CreateEvent (
- EFI_EVENT_TIMER | EFI_EVENT_NOTIFY_SIGNAL,
- EFI_TPL_NOTIFY,
+ EVT_TIMER | EVT_NOTIFY_SIGNAL,
+ TPL_NOTIFY,
EbcPeriodicNotifyFunction,
&mVmPtr,
&mEbcPeriodicEvent
@@ -720,7 +720,7 @@ Routine Description: The default Exception Callback for the VM interpreter.
In this function, we report status code, and print debug information
about EBC_CONTEXT, then dead loop.
-
+
Arguments:
InterruptType - Interrupt type.
@@ -729,7 +729,7 @@ Arguments: Returns:
None
-
+
--*/
{
//
@@ -753,7 +753,7 @@ Routine Description: The periodic callback function for EBC VM interpreter, which is used
to support the EFI debug support protocol.
-
+
Arguments:
Event - The Periodic Callback Event.
@@ -762,7 +762,7 @@ Arguments: Returns:
None.
-
+
--*/
{
VM_CONTEXT *VmPtr;
@@ -787,7 +787,7 @@ Routine Description: The VM interpreter calls this function on a periodic basis to support
the EFI debug support protocol.
-
+
Arguments:
VmPtr - pointer to a VM context for passing info to the debugger.
@@ -795,12 +795,12 @@ Arguments: Returns:
Standard EFI status.
-
+
--*/
{
EFI_SYSTEM_CONTEXT_EBC EbcContext;
EFI_SYSTEM_CONTEXT SystemContext;
-
+
//
// If someone's registered for periodic callbacks, then call them.
//
@@ -838,7 +838,7 @@ Returns: VmPtr->Ip = (VMIP)(UINTN)EbcContext.Ip;
VmPtr->Flags = EbcContext.Flags;
}
-
+
return EFI_SUCCESS;
}
@@ -852,8 +852,8 @@ EbcUnloadImage ( /*++
Routine Description:
-
- This routine is called by the core when an image is being unloaded from
+
+ This routine is called by the core when an image is being unloaded from
memory. Basically we now have the opportunity to do any necessary cleanup.
Typically this will include freeing any memory allocated for thunk-creation.
@@ -931,8 +931,8 @@ EbcAddImageThunk ( /*++
Routine Description:
-
- Add a thunk to our list of thunks for a given image handle.
+
+ Add a thunk to our list of thunks for a given image handle.
Also flush the instruction cache since we've written thunk code
to memory that will be executed eventually.
@@ -943,7 +943,7 @@ Arguments: ThunkSize - the size of the thunk memory allocated
Returns:
-
+
EFI_OUT_OF_RESOURCES - memory allocation failed
EFI_SUCCESS - successful completion
@@ -1041,7 +1041,7 @@ GetEBCStack( {
UINTN Index;
EFI_TPL OldTpl;
- OldTpl = gBS->RaiseTPL(EFI_TPL_HIGH_LEVEL);
+ OldTpl = gBS->RaiseTPL(TPL_HIGH_LEVEL);
for (Index = 0; Index < mStackNum; Index ++) {
if (mStackBufferIndex[Index] == NULL) {
mStackBufferIndex[Index] = Handle;
@@ -1121,7 +1121,7 @@ InitEbcVmTestProtocol ( /*++
Routine Description:
-
+
Produce an EBC VM test protocol that can be used for regression tests.
Arguments:
diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c index 741116ae3f..f56cf04215 100644 --- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c +++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.c @@ -824,7 +824,7 @@ Returns: return EFI_OUT_OF_RESOURCES;
}
- EfiInitializeLock(&mVariableModuleGlobal->VariableGlobal[Physical].VariableServicesLock, EFI_TPL_NOTIFY);
+ EfiInitializeLock(&mVariableModuleGlobal->VariableGlobal[Physical].VariableServicesLock, TPL_NOTIFY);
//
// Intialize volatile variable store
diff --git a/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/MonotonicCounter.c b/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/MonotonicCounter.c index da76b55e45..31efab323a 100644 --- a/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/MonotonicCounter.c +++ b/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/MonotonicCounter.c @@ -1,13 +1,13 @@ /*++
-Copyright (c) 2006 - 2007, 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 - 2007, 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:
@@ -84,7 +84,7 @@ Returns: //
// Update the monotonic counter with a lock
//
- OldTpl = gBS->RaiseTPL (EFI_TPL_HIGH_LEVEL);
+ OldTpl = gBS->RaiseTPL (TPL_HIGH_LEVEL);
*Count = mEfiMtc;
mEfiMtc++;
gBS->RestoreTPL (OldTpl);
@@ -104,22 +104,22 @@ Returns: /**
Returns the next high 32 bits of the platform's monotonic counter.
- The GetNextHighMonotonicCount() function returns the next high 32 bits
- of the platform's monotonic counter. The platform's monotonic counter is
- comprised of two 32 bit quantities: the high 32 bits and the low 32 bits.
- During boot service time the low 32 bit value is volatile: it is reset to
+ The GetNextHighMonotonicCount() function returns the next high 32 bits
+ of the platform's monotonic counter. The platform's monotonic counter is
+ comprised of two 32 bit quantities: the high 32 bits and the low 32 bits.
+ During boot service time the low 32 bit value is volatile: it is reset to
zero on every system reset and is increased by 1 on every call to GetNextMonotonicCount().
- The high 32 bit value is non-volatile and is increased by 1 whenever the system resets
+ The high 32 bit value is non-volatile and is increased by 1 whenever the system resets
or whenever the low 32 bit count [returned by GetNextMonoticCount()] overflows.
- The GetNextMonotonicCount() function is only available at boot services time.
- If the operating system wishes to extend the platform monotonic counter to runtime,
- it may do so by utilizing GetNextHighMonotonicCount(). To do this, before calling
- ExitBootServices() the operating system would call GetNextMonotonicCount() to obtain
- the current platform monotonic count. The operating system would then provide an
- interface that returns the next count by:
+ The GetNextMonotonicCount() function is only available at boot services time.
+ If the operating system wishes to extend the platform monotonic counter to runtime,
+ it may do so by utilizing GetNextHighMonotonicCount(). To do this, before calling
+ ExitBootServices() the operating system would call GetNextMonotonicCount() to obtain
+ the current platform monotonic count. The operating system would then provide an
+ interface that returns the next count by:
Adding 1 to the last count.
- Before the lower 32 bits of the count overflows, call GetNextHighMonotonicCount().
- This will increase the high 32 bits of the platform's non-volatile portion of the monotonic
+ Before the lower 32 bits of the count overflows, call GetNextHighMonotonicCount().
+ This will increase the high 32 bits of the platform's non-volatile portion of the monotonic
count by 1.
This function may only be called at Runtime.
@@ -128,7 +128,7 @@ Returns: @retval EFI_INVALID_PARAMETER If HighCount is NULL.
@retval EFI_SUCCESS Operation is successful.
- @retval EFI_OUT_OF_RESOURCES If variable service reports that not enough storage
+ @retval EFI_OUT_OF_RESOURCES If variable service reports that not enough storage
is available to hold the variable and its data.
@retval EFI_DEVICE_ERROR The variable could not be saved due to a hardware failure.
@@ -162,7 +162,7 @@ Returns: //
// Use a lock if called before ExitBootServices()
//
- OldTpl = gBS->RaiseTPL (EFI_TPL_HIGH_LEVEL);
+ OldTpl = gBS->RaiseTPL (TPL_HIGH_LEVEL);
*HighCount = (UINT32) RShiftU64 (mEfiMtc, 32) + 1;
mEfiMtc = LShiftU64 (*HighCount, 32);
gBS->RestoreTPL (OldTpl);
@@ -203,7 +203,7 @@ Arguments: Returns:
- EFI_SUCCESS The event has been handled properly
+ EFI_SUCCESS The event has been handled properly
EFI_NOT_FOUND An error occurred updating the variable.
--*/
@@ -243,8 +243,8 @@ Returns: // Initialize event to handle overflows
//
Status = gBS->CreateEvent (
- EFI_EVENT_NOTIFY_SIGNAL,
- EFI_TPL_CALLBACK,
+ EVT_NOTIFY_SIGNAL,
+ TPL_CALLBACK,
EfiMtcEventHandler,
NULL,
&mEfiMtcEvent
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c index 251690205a..0eceddf261 100644 --- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c +++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c @@ -417,8 +417,8 @@ WaitForReceive ( // Create callback event and set timer
//
StatCode = gBS->CreateEvent (
- EFI_EVENT_TIMER,
- EFI_TPL_CALLBACK,
+ EVT_TIMER,
+ TPL_CALLBACK,
NULL,
NULL,
&CallbackEvent
@@ -622,8 +622,8 @@ SendPacket ( // headersize should be zero if not filled in
//
StatCode = gBS->CreateEvent (
- EFI_EVENT_TIMER,
- EFI_TPL_CALLBACK,
+ EVT_TIMER,
+ TPL_CALLBACK,
NULL,
NULL,
&TimeoutEvent
@@ -695,8 +695,8 @@ SendPacket ( // immediately
//
StatCode = gBS->CreateEvent (
- EFI_EVENT_TIMER,
- EFI_TPL_CALLBACK,
+ EVT_TIMER,
+ TPL_CALLBACK,
NULL,
NULL,
&TimeoutEvent
@@ -2009,7 +2009,7 @@ BcSetStationIP ( StationIpPtr = &PxebcMode->StationIp;
}
- if (!IS_INADDR_UNICAST (StationIpPtr) ||
+ if (!IS_INADDR_UNICAST (StationIpPtr) ||
((StationIpPtr->Addr[0] | SubnetMask) == BROADCAST_IPv4)) {
//
// The station IP is not a unicast address.
@@ -2159,10 +2159,10 @@ PxeBcDriverStart ( //
// Lock access, just in case
//
- EfiInitializeLock (&Private->Lock, EFI_TPL_CALLBACK);
+ EfiInitializeLock (&Private->Lock, TPL_CALLBACK);
EfiAcquireLock (&Private->Lock);
- EfiInitializeLock (&pLF->Lock, EFI_TPL_CALLBACK);
+ EfiInitializeLock (&pLF->Lock, TPL_CALLBACK);
EfiAcquireLock (&pLF->Lock);
//
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_arp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_arp.c index b7edbe69a8..747d243f1f 100644 --- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_arp.c +++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_arp.c @@ -1,13 +1,13 @@ /*++
-Copyright (c) 2006 - 2007, 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 - 2007, 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:
pxe_bc_arp.c
@@ -405,7 +405,7 @@ Returns: // not how it would be done in a full system
//
#define ARP_REQUEST_TIMEOUT_MS 500 // try for half a second
-
+
////////////////////////////////////////////////////////////
//
// BC Arp Routine
@@ -543,8 +543,8 @@ Returns: //
//
StatCode = gBS->CreateEvent (
- EFI_EVENT_TIMER,
- EFI_TPL_CALLBACK,
+ EVT_TIMER,
+ TPL_CALLBACK,
NULL,
NULL,
&TimeoutEvent
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c index a1f4715cd0..b557f4cae3 100644 --- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c +++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c @@ -587,8 +587,8 @@ SetStationIP ( }
EfiStatus = gBS->CreateEvent (
- EFI_EVENT_TIMER,
- EFI_TPL_CALLBACK,
+ EVT_TIMER,
+ TPL_CALLBACK,
NULL,
NULL,
&Private->Igmpv1TimeoutEvent
@@ -1283,8 +1283,8 @@ GetOffers ( //
Private->GotProxy[DHCP_ONLY_IX] = 1;
StatCode = gBS->CreateEvent (
- EFI_EVENT_TIMER,
- EFI_TPL_CALLBACK,
+ EVT_TIMER,
+ TPL_CALLBACK,
NULL,
NULL,
&TimeoutEvent
@@ -1522,8 +1522,8 @@ GetBINLAck ( //
//
StatCode = gBS->CreateEvent (
- EFI_EVENT_TIMER,
- EFI_TPL_CALLBACK,
+ EVT_TIMER,
+ TPL_CALLBACK,
NULL,
NULL,
&TimeoutEvent
@@ -1770,8 +1770,8 @@ TryFinishDORA ( //
//
StatCode = gBS->CreateEvent (
- EFI_EVENT_TIMER,
- EFI_TPL_CALLBACK,
+ EVT_TIMER,
+ TPL_CALLBACK,
NULL,
NULL,
&TimeoutEvent
@@ -2599,8 +2599,8 @@ Returns: //
//
StatCode = gBS->CreateEvent (
- EFI_EVENT_TIMER,
- EFI_TPL_CALLBACK,
+ EVT_TIMER,
+ TPL_CALLBACK,
NULL,
NULL,
&TimeoutEvent
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_igmp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_igmp.c index 83ca20b292..22dcf25524 100644 --- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_igmp.c +++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_igmp.c @@ -83,8 +83,8 @@ Returns: }
EfiStatus = gBS->CreateEvent (
- EFI_EVENT_TIMER,
- EFI_TPL_CALLBACK,
+ EVT_TIMER,
+ TPL_CALLBACK,
NULL,
NULL,
&Private->IgmpGroupEvent[TimerId]
@@ -405,8 +405,8 @@ Returns: }
EfiStatus = gBS->CreateEvent (
- EFI_EVENT_TIMER,
- EFI_TPL_CALLBACK,
+ EVT_TIMER,
+ TPL_CALLBACK,
NULL,
NULL,
&Private->Igmpv1TimeoutEvent
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_mtftp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_mtftp.c index 941076aed0..e2afbffa89 100644 --- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_mtftp.c +++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_mtftp.c @@ -117,8 +117,8 @@ Returns: //
//
Status = gBS->CreateEvent (
- EFI_EVENT_TIMER,
- EFI_TPL_CALLBACK,
+ EVT_TIMER,
+ TPL_CALLBACK,
NULL,
NULL,
&TimeoutEvent
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_loadfile.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_loadfile.c index 85bb8bb2bf..20ae95d981 100644 --- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_loadfile.c +++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_loadfile.c @@ -1,17 +1,17 @@ /*++
-Copyright (c) 2006 - 2007, 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 - 2007, 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:
pxe_loadfile.c
-
+
Abstract:
An implementation of the load file protocol for network devices.
@@ -65,9 +65,9 @@ Arguments: Returns:
- EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE -
+ EFI_PXE_BASE_CODE_CALLBACK_STATUS_CONTINUE -
EFI_PXE_BASE_CODE_CALLBACK_STATUS_ABORT -
-
+
--*/
{
STATIC UINTN Propeller;
@@ -173,7 +173,7 @@ Arguments: Returns:
None
-
+
--*/
{
if (Ptr != NULL) {
@@ -199,7 +199,7 @@ Arguments: Returns:
None
-
+
--*/
{
EFI_PXE_BASE_CODE_MODE *PxeBcMode;
@@ -276,11 +276,11 @@ Arguments: Returns:
- AUTO_SELECT -
+ AUTO_SELECT -
DO_MENU -
- NO_MENU -
- LOCAL_BOOT -
-
+ NO_MENU -
+ LOCAL_BOOT -
+
--*/
{
EFI_STATUS Status;
@@ -307,8 +307,8 @@ Returns: //
//
Status = gBS->CreateEvent (
- EFI_EVENT_TIMER,
- EFI_TPL_CALLBACK,
+ EVT_TIMER,
+ TPL_CALLBACK,
NULL,
NULL,
&TimeoutEvent
@@ -332,8 +332,8 @@ Returns: //
//
Status = gBS->CreateEvent (
- EFI_EVENT_TIMER,
- EFI_TPL_CALLBACK,
+ EVT_TIMER,
+ TPL_CALLBACK,
NULL,
NULL,
&SecondsEvent
@@ -375,7 +375,7 @@ Returns: gST->ConOut->SetCursorPosition (gST->ConOut, SecColumn, SecRow);
AsciiPrint ("(%d) ", SecsLeft);
-
+
//
// set the default action to be AUTO_SELECT
//
@@ -507,9 +507,9 @@ Arguments: Returns:
- NO_MENU -
- LOCAL_BOOT -
-
+ NO_MENU -
+ LOCAL_BOOT -
+
--*/
{
PXE_OP_DISCOVERY_CONTROL *DiscoveryControlPtr;
@@ -804,7 +804,7 @@ Arguments: Returns:
Value from DHCP option
-
+
--*/
{
if (OpPtr->Header.Length == 1) {
@@ -836,7 +836,7 @@ Arguments: Returns:
Pointer to opcode, may be NULL
-
+
--*/
{
if (BufferPtr == NULL) {
@@ -889,7 +889,7 @@ Arguments: Returns:
Pointer to option in packet
-
+
--*/
{
UINTN PacketLen;
@@ -1234,9 +1234,9 @@ Arguments: Returns:
- EFI_SUCCESS -
- EFI_NOT_READY -
-
+ EFI_SUCCESS -
+ EFI_NOT_READY -
+
--*/
{
EFI_PXE_BASE_CODE_MODE *PxeBcMode;
@@ -1363,7 +1363,7 @@ Arguments: This - Pointer to Loadfile interface
FilePath - Not used and not checked
BootPolicy - Must be TRUE
- BufferSize - Pointer to buffer size
+ BufferSize - Pointer to buffer size
Buffer - Pointer to download buffer or NULL
Returns:
diff --git a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/support.c b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/support.c index 503d5a6038..b6667ca4ed 100644 --- a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/support.c +++ b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/support.c @@ -558,8 +558,8 @@ Returns: // Setup timeout event and start timer.
//
efi_status = gBS->CreateEvent (
- EFI_EVENT_TIMER | EFI_EVENT_NOTIFY_SIGNAL,
- EFI_TPL_NOTIFY,
+ EVT_TIMER | EVT_NOTIFY_SIGNAL,
+ TPL_NOTIFY,
&timeout_notify,
Private,
&Private->TimeoutEvent
@@ -588,8 +588,8 @@ Returns: // Setup periodic event for callbacks
//
efi_status = gBS->CreateEvent (
- EFI_EVENT_TIMER | EFI_EVENT_NOTIFY_SIGNAL,
- EFI_TPL_NOTIFY,
+ EVT_TIMER | EVT_NOTIFY_SIGNAL,
+ TPL_NOTIFY,
&periodic_notify,
Private,
&Private->PeriodicEvent
diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/callback.c b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/callback.c index 2821e650f0..6f6ac81d59 100644 --- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/callback.c +++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/callback.c @@ -112,7 +112,7 @@ Returns: // created at a lower level (TPL_CALLBACK) it gives an assert!
//
if (mInitializeLock) {
- EfiInitializeLock (&mLock, EFI_TPL_NOTIFY);
+ EfiInitializeLock (&mLock, TPL_NOTIFY);
mInitializeLock = FALSE;
}
diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/initialize.c b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/initialize.c index 80e6033ff7..9e0ecca709 100644 --- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/initialize.c +++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/initialize.c @@ -1,12 +1,12 @@ /*++
-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:
initialize.c
@@ -190,8 +190,8 @@ Returns: //
//
EfiStatus = gBS->CreateEvent (
- EFI_EVENT_NOTIFY_WAIT,
- EFI_TPL_NOTIFY,
+ EVT_NOTIFY_WAIT,
+ TPL_NOTIFY,
&SnpWaitForPacketNotify,
snp,
&snp->snp.WaitForPacket
diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/snp.c b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/snp.c index a32812a01a..4b8d6f8107 100644 --- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/snp.c +++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/snp.c @@ -453,7 +453,7 @@ Arguments: snp->Signature = SNP_DRIVER_SIGNATURE;
- EfiInitializeLock (&snp->lock, EFI_TPL_NOTIFY);
+ EfiInitializeLock (&snp->lock, TPL_NOTIFY);
snp->snp.Revision = EFI_SIMPLE_NETWORK_PROTOCOL_REVISION;
snp->snp.Start = snp_undi32_start;
diff --git a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c index 2fd9cab523..01a26bb0bf 100644 --- a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c +++ b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c @@ -17,7 +17,7 @@ Module Name: Pcd.c #include "Service.h"
-EFI_LOCK mPcdDatabaseLock = EFI_INITIALIZE_LOCK_VARIABLE(EFI_TPL_CALLBACK);
+EFI_LOCK mPcdDatabaseLock = EFI_INITIALIZE_LOCK_VARIABLE(TPL_CALLBACK);
PCD_PROTOCOL mPcdInstance = {
DxePcdSetSku,
diff --git a/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.c b/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.c index 17cafea187..f8c4cb0e3e 100644 --- a/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.c +++ b/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.c @@ -342,7 +342,7 @@ Returns: //
for (Link = mRuntime.EventHead.ForwardLink; Link != &mRuntime.EventHead; Link = Link->ForwardLink) {
RuntimeEvent = _CR (Link, EFI_RUNTIME_EVENT_ENTRY, Link);
- if ((RuntimeEvent->Type & EFI_EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE) == EFI_EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE) {
+ if ((RuntimeEvent->Type & EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE) == EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE) {
RuntimeEvent->NotifyFunction (
RuntimeEvent->Event,
RuntimeEvent->NotifyContext
diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c b/EdkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c index 85e552bac0..72d699df44 100644 --- a/EdkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c +++ b/EdkModulePkg/Universal/StatusCode/Dxe/DataHubStatusCodeWorker.c @@ -1,14 +1,14 @@ /** @file
Data Hub status code worker in DXE.
- 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: DataHubStatusCodeWorker.c
@@ -33,9 +33,9 @@ EFI_DATA_HUB_PROTOCOL *mDataHubProtocol; /**
Return one DATAHUB_STATUSCODE_RECORD space.
- The size of free record pool would be extend, if the pool is empty.
+ The size of free record pool would be extend, if the pool is empty.
+
-
@retval NULL Can not allocate free memeory for record.
@retval !NULL Point to buffer of record.
@@ -51,7 +51,7 @@ AcquireRecordBuffer ( LIST_ENTRY *Node;
UINT32 Index;
- CurrentTpl = gBS->RaiseTPL (EFI_TPL_HIGH_LEVEL);
+ CurrentTpl = gBS->RaiseTPL (TPL_HIGH_LEVEL);
if (!IsListEmpty (&mRecordsBuffer)) {
Node = GetFirstNode (&mRecordsBuffer);
@@ -59,7 +59,7 @@ AcquireRecordBuffer ( Record = _CR (Node, DATAHUB_STATUSCODE_RECORD, Node);
} else {
- if (CurrentTpl > EFI_TPL_NOTIFY) {
+ if (CurrentTpl > TPL_NOTIFY) {
gBS->RestoreTPL (CurrentTpl);
return NULL;
}
@@ -70,7 +70,7 @@ AcquireRecordBuffer ( return NULL;
}
- CurrentTpl = gBS->RaiseTPL (EFI_TPL_HIGH_LEVEL);
+ CurrentTpl = gBS->RaiseTPL (TPL_HIGH_LEVEL);
for (Index = 1; Index < 16; Index++) {
InsertTailList (&mRecordsBuffer, &Record[Index].Node);
}
@@ -86,12 +86,12 @@ AcquireRecordBuffer ( /**
- Retrieve one record from Records FIFO. The record would be removed from FIFO and
+ Retrieve one record from Records FIFO. The record would be removed from FIFO and
release to free record buffer.
@return !NULL Point to record, which is ready to be logged.
@return NULL the FIFO of record is empty.
-
+
**/
STATIC
DATAHUB_STATUSCODE_RECORD *
@@ -103,7 +103,7 @@ RetrieveRecord ( LIST_ENTRY *Node;
EFI_TPL CurrentTpl;
- CurrentTpl = gBS->RaiseTPL (EFI_TPL_HIGH_LEVEL);
+ CurrentTpl = gBS->RaiseTPL (TPL_HIGH_LEVEL);
if (!IsListEmpty (&mRecordsFifo)) {
Node = GetFirstNode (&mRecordsFifo);
@@ -122,29 +122,29 @@ RetrieveRecord ( /**
Report status code into DataHub.
-
+
@param CodeType Indicates the type of status code being reported. Type EFI_STATUS_CODE_TYPE is defined in "Related Definitions" below.
-
- @param Value Describes the current status of a hardware or software entity.
- This included information about the class and subclass that is used to classify the entity
- as well as an operation. For progress codes, the operation is the current activity.
- For error codes, it is the exception. For debug codes, it is not defined at this time.
- Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.
+
+ @param Value Describes the current status of a hardware or software entity.
+ This included information about the class and subclass that is used to classify the entity
+ as well as an operation. For progress codes, the operation is the current activity.
+ For error codes, it is the exception. For debug codes, it is not defined at this time.
+ Type EFI_STATUS_CODE_VALUE is defined in "Related Definitions" below.
Specific values are discussed in the Intel? Platform Innovation Framework for EFI Status Code Specification.
-
- @param Instance The enumeration of a hardware or software entity within the system.
- A system may contain multiple entities that match a class/subclass pairing.
- The instance differentiates between them. An instance of 0 indicates that instance information is unavailable,
+
+ @param Instance The enumeration of a hardware or software entity within the system.
+ A system may contain multiple entities that match a class/subclass pairing.
+ The instance differentiates between them. An instance of 0 indicates that instance information is unavailable,
not meaningful, or not relevant. Valid instance numbers start with 1.
- @param CallerId This optional parameter may be used to identify the caller.
- This parameter allows the status code driver to apply different rules to different callers.
+ @param CallerId This optional parameter may be used to identify the caller.
+ This parameter allows the status code driver to apply different rules to different callers.
Type EFI_GUID is defined in InstallProtocolInterface() in the EFI 1.10 Specification.
@param Data This optional parameter may be used to pass additional data
-
+
@retval EFI_OUT_OF_RESOURCES Can not acquire record buffer.
@retval EFI_DEVICE_ERROR EFI serial device can not work after ExitBootService() is called .
@retval EFI_SUCCESS Success to cache status code and signal log data event.
@@ -212,7 +212,7 @@ DataHubStatusCodeReportWorker ( if (Data->Size > EFI_STATUS_CODE_DATA_MAX_SIZE) {
Record->Data.Size = EFI_STATUS_CODE_DATA_MAX_SIZE;
- }
+ }
CopyMem (Record->ExtendData, Data + 1, Record->Data.Size);
}
}
@@ -276,7 +276,7 @@ LogDataHubEventCallBack ( //
// Log DataRecord in Data Hub
//
-
+
mDataHubProtocol->LogData (
mDataHubProtocol,
&gEfiStatusCodeGuid,
@@ -293,7 +293,7 @@ LogDataHubEventCallBack ( /**
Initialize data hubstatus code.
Create a data hub listener.
-
+
@return The function always return EFI_SUCCESS
**/
@@ -315,8 +315,8 @@ DataHubStatusCodeInitializeWorker ( // Create a Notify Event to log data in Data Hub
//
Status = gBS->CreateEvent (
- EFI_EVENT_NOTIFY_SIGNAL,
- EFI_TPL_CALLBACK,
+ EVT_NOTIFY_SIGNAL,
+ TPL_CALLBACK,
LogDataHubEventCallBack,
NULL,
&mLogDataHubEvent
diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c b/EdkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c index a9dff1defd..ed9fd5980f 100644 --- a/EdkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c +++ b/EdkModulePkg/Universal/StatusCode/Dxe/SerialStatusCodeWorker.c @@ -99,10 +99,10 @@ SerialStatusCodeReportWorker ( if (EfiAtRuntime ()) {
return EFI_DEVICE_ERROR;
}
- CurrentTpl = gBS->RaiseTPL (EFI_TPL_HIGH_LEVEL);
+ CurrentTpl = gBS->RaiseTPL (TPL_HIGH_LEVEL);
gBS->RestoreTPL (CurrentTpl);
- if (CurrentTpl > EFI_TPL_CALLBACK ) {
+ if (CurrentTpl > TPL_CALLBACK ) {
return EFI_DEVICE_ERROR;
}
}
diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Ui.c b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Ui.c index 40bd826023..3d30c1bd2d 100644 --- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Ui.c +++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Ui.c @@ -291,7 +291,7 @@ Returns: //
// Create a timer event
//
- Status = gBS->CreateEvent (EFI_EVENT_TIMER, 0, NULL, NULL, &TimerEvent);
+ Status = gBS->CreateEvent (EVT_TIMER, 0, NULL, NULL, &TimerEvent);
if (!EFI_ERROR (Status)) {
//
// Set the timer event
@@ -324,7 +324,7 @@ Returns: Timeout = ONE_SECOND;
do {
- Status = gBS->CreateEvent (EFI_EVENT_TIMER, 0, NULL, NULL, &TimerEvent);
+ Status = gBS->CreateEvent (EVT_TIMER, 0, NULL, NULL, &TimerEvent);
//
// Set the timer event
diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.c index 589217a992..79c23ce7b3 100644 --- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.c +++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.c @@ -1309,7 +1309,7 @@ Returns: return EFI_OUT_OF_RESOURCES;
}
- EfiInitializeLock(&mVariableModuleGlobal->VariableGlobal[Physical].VariableServicesLock, EFI_TPL_NOTIFY);
+ EfiInitializeLock(&mVariableModuleGlobal->VariableGlobal[Physical].VariableServicesLock, TPL_NOTIFY);
//
// Allocate memory for volatile variable store
diff --git a/EdkModulePkg/Universal/WatchdogTimer/Dxe/WatchDogTimer.c b/EdkModulePkg/Universal/WatchdogTimer/Dxe/WatchDogTimer.c index 2f8866711d..e38def3b05 100644 --- a/EdkModulePkg/Universal/WatchdogTimer/Dxe/WatchDogTimer.c +++ b/EdkModulePkg/Universal/WatchdogTimer/Dxe/WatchDogTimer.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:
@@ -66,15 +66,15 @@ WatchdogTimerDriverExpires ( Routine Description:
- Notification function that is called if the watchdog timer is fired. If a
+ Notification function that is called if the watchdog timer is fired. If a
handler has been registered with the Watchdog Timer Architectural Protocol,
then that handler is called passing in the time period that has passed that
- cause the watchdog timer to fire. Then, a call to the Runtime Service
+ cause the watchdog timer to fire. Then, a call to the Runtime Service
ResetSystem() is made to reset the platform.
-
+
Arguments:
- Timer - The one-shot timer event that was signaled when the watchdog timer
+ Timer - The one-shot timer event that was signaled when the watchdog timer
expired.
Context - The context that was registered when the event Timer was created.
@@ -115,15 +115,15 @@ WatchdogTimerDriverRegisterHandler ( Routine Description:
- This function registers a handler that is to be invoked when the watchdog
- timer fires. By default, the EFI_WATCHDOG_TIMER protocol will call the
- Runtime Service ResetSystem() when the watchdog timer fires. If a
- NotifyFunction is registered, then the NotifyFunction will be called before
- the Runtime Service ResetSystem() is called. If NotifyFunction is NULL, then
- the watchdog handler is unregistered. If a watchdog handler is registered,
- then EFI_SUCCESS is returned. If an attempt is made to register a handler
- when a handler is already registered, then EFI_ALREADY_STARTED is returned.
- If an attempt is made to uninstall a handler when a handler is not installed,
+ This function registers a handler that is to be invoked when the watchdog
+ timer fires. By default, the EFI_WATCHDOG_TIMER protocol will call the
+ Runtime Service ResetSystem() when the watchdog timer fires. If a
+ NotifyFunction is registered, then the NotifyFunction will be called before
+ the Runtime Service ResetSystem() is called. If NotifyFunction is NULL, then
+ the watchdog handler is unregistered. If a watchdog handler is registered,
+ then EFI_SUCCESS is returned. If an attempt is made to register a handler
+ when a handler is already registered, then EFI_ALREADY_STARTED is returned.
+ If an attempt is made to uninstall a handler when a handler is not installed,
then return EFI_INVALID_PARAMETER.
Arguments:
@@ -133,15 +133,15 @@ Arguments: NotifyFunction - The function to call when the watchdog timer fires. If this
is NULL, then the handler will be unregistered.
-Returns:
+Returns:
- EFI_SUCCESS - The watchdog timer handler was registered or
+ EFI_SUCCESS - The watchdog timer handler was registered or
unregistered.
- EFI_ALREADY_STARTED - NotifyFunction is not NULL, and a handler is already
+ EFI_ALREADY_STARTED - NotifyFunction is not NULL, and a handler is already
registered.
- EFI_INVALID_PARAMETER - NotifyFunction is NULL, and a handler was not
+ EFI_INVALID_PARAMETER - NotifyFunction is NULL, and a handler was not
previously registered.
--*/
@@ -169,24 +169,24 @@ WatchdogTimerDriverSetTimerPeriod ( Routine Description:
- This function sets the amount of time to wait before firing the watchdog
- timer to TimerPeriod 100 nS units. If TimerPeriod is 0, then the watchdog
+ This function sets the amount of time to wait before firing the watchdog
+ timer to TimerPeriod 100 nS units. If TimerPeriod is 0, then the watchdog
timer is disabled.
Arguments:
This - The EFI_WATCHDOG_TIMER_ARCH_PROTOCOL instance.
- TimerPeriod - The amount of time in 100 nS units to wait before the watchdog
- timer is fired. If TimerPeriod is zero, then the watchdog
+ TimerPeriod - The amount of time in 100 nS units to wait before the watchdog
+ timer is fired. If TimerPeriod is zero, then the watchdog
timer is disabled.
-
-Returns:
- EFI_SUCCESS - The watchdog timer has been programmed to fire in Time
+Returns:
+
+ EFI_SUCCESS - The watchdog timer has been programmed to fire in Time
100 nS units.
- EFI_DEVICE_ERROR - A watchdog timer could not be programmed due to a device
+ EFI_DEVICE_ERROR - A watchdog timer could not be programmed due to a device
error.
--*/
@@ -210,21 +210,21 @@ WatchdogTimerDriverGetTimerPeriod ( Routine Description:
- This function retrieves the amount of time the system will wait before firing
- the watchdog timer. This period is returned in TimerPeriod, and EFI_SUCCESS
+ This function retrieves the amount of time the system will wait before firing
+ the watchdog timer. This period is returned in TimerPeriod, and EFI_SUCCESS
is returned. If TimerPeriod is NULL, then EFI_INVALID_PARAMETER is returned.
Arguments:
This - The EFI_WATCHDOG_TIMER_ARCH_PROTOCOL instance.
- TimerPeriod - A pointer to the amount of time in 100 nS units that the system
+ TimerPeriod - A pointer to the amount of time in 100 nS units that the system
will wait before the watchdog timer is fired. If TimerPeriod of
zero is returned, then the watchdog timer is disabled.
-
-Returns:
- EFI_SUCCESS - The amount of time that the system will wait before
+Returns:
+
+ EFI_SUCCESS - The amount of time that the system will wait before
firing the watchdog timer was returned in TimerPeriod.
EFI_INVALID_PARAMETER - TimerPeriod is NULL.
@@ -263,7 +263,7 @@ Returns: EFI_SUCCESS - Timer Architectural Protocol created
EFI_OUT_OF_RESOURCES - Not enough resources available to initialize driver.
-
+
EFI_DEVICE_ERROR - A device error occured attempting to initialize the driver.
--*/
@@ -283,8 +283,8 @@ Returns: // Create the timer event used to implement a simple watchdog timer
//
Status = gBS->CreateEvent (
- EFI_EVENT_TIMER | EFI_EVENT_NOTIFY_SIGNAL,
- EFI_TPL_NOTIFY,
+ EVT_TIMER | EVT_NOTIFY_SIGNAL,
+ TPL_NOTIFY,
WatchdogTimerDriverExpires,
NULL,
&mWatchdogTimerEvent
|