diff options
Diffstat (limited to 'EdkModulePkg/Universal/Console')
3 files changed, 34 insertions, 34 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;
|