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 --- .../MiscSubclass/MiscSubclassDriverEntryPoint.c | 4 +-- .../Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.c | 8 +++--- EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/ConsoleIn.c | 4 +-- EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopInput.c | 2 +- EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopScreen.c | 2 +- .../Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.c | 12 ++++----- .../Bus/SimpleFileSystem/WinNtSimpleFileSystem.c | 20 +++++++-------- EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUgaInput.c | 30 +++++++++++----------- EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUgaScreen.c | 8 +++--- EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.c | 2 +- EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.c | 4 +-- EdkNt32Pkg/RuntimeDxe/FvbServices/FWBlockService.c | 2 +- 12 files changed, 49 insertions(+), 49 deletions(-) (limited to 'EdkNt32Pkg') diff --git a/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriverEntryPoint.c b/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriverEntryPoint.c index 240a24e..03eb74f 100644 --- a/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriverEntryPoint.c +++ b/EdkNt32Pkg/Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriverEntryPoint.c @@ -321,8 +321,8 @@ Returns: // Install notify function to fetch memory data through WinNtIo protocol and store to data hub. // EfiStatus = gBS->CreateEvent ( - EFI_EVENT_NOTIFY_SIGNAL, - EFI_TPL_CALLBACK, + EVT_NOTIFY_SIGNAL, + TPL_CALLBACK, WinNtIoProtocolNotifyFunction, ImageHandle, &Event diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.c b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.c index 5666ec2..effc8fa 100644 --- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.c +++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.c @@ -433,7 +433,7 @@ Returns: Private = AllocatePool (sizeof (WIN_NT_BLOCK_IO_PRIVATE)); ASSERT (Private != NULL); - EfiInitializeLock (&Private->Lock, EFI_TPL_NOTIFY); + EfiInitializeLock (&Private->Lock, TPL_NOTIFY); Private->WinNtThunk = WinNtIo->WinNtThunk; @@ -849,7 +849,7 @@ WinNtBlockIoReadBlocks ( DWORD BytesRead; EFI_TPL OldTpl; - OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK); + OldTpl = gBS->RaiseTPL (TPL_CALLBACK); Private = WIN_NT_BLOCK_IO_PRIVATE_DATA_FROM_THIS (This); @@ -917,7 +917,7 @@ WinNtBlockIoWriteBlocks ( EFI_STATUS Status; EFI_TPL OldTpl; - OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK); + OldTpl = gBS->RaiseTPL (TPL_CALLBACK); Private = WIN_NT_BLOCK_IO_PRIVATE_DATA_FROM_THIS (This); @@ -996,7 +996,7 @@ WinNtBlockIoResetBlock ( WIN_NT_BLOCK_IO_PRIVATE *Private; EFI_TPL OldTpl; - OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK); + OldTpl = gBS->RaiseTPL (TPL_CALLBACK); Private = WIN_NT_BLOCK_IO_PRIVATE_DATA_FROM_THIS (This); diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/ConsoleIn.c b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/ConsoleIn.c index a4e2b3f..eaee537 100644 --- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/ConsoleIn.c +++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Console/ConsoleIn.c @@ -345,8 +345,8 @@ Returns: Private->SimpleTextIn.ReadKeyStroke = WinNtSimpleTextInReadKeyStroke; Status = gBS->CreateEvent ( - EFI_EVENT_NOTIFY_WAIT, - EFI_TPL_NOTIFY, + EVT_NOTIFY_WAIT, + TPL_NOTIFY, WinNtSimpleTextInWaitForKey, Private, &Private->SimpleTextIn.WaitForKey diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopInput.c b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopInput.c index 77006af..385e32f 100644 --- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopInput.c +++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopInput.c @@ -323,7 +323,7 @@ WinNtGopInitializeSimpleTextInForWindow ( Private->SimpleTextIn.ReadKeyStroke = WinNtGopSimpleTextInReadKeyStroke; Status = gBS->CreateEvent ( - EVENT_NOTIFY_WAIT, + EVT_NOTIFY_WAIT, TPL_NOTIFY, WinNtGopSimpleTextInWaitForKey, Private, diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopScreen.c b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopScreen.c index 89a5e4d..017b4f3 100644 --- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopScreen.c +++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopScreen.c @@ -835,7 +835,7 @@ WinNtGopStartWindow ( // Register to be notified on exit boot services so we can destroy the window. // Status = gBS->CreateEvent ( - EVENT_SIGNAL_EXIT_BOOT_SERVICES, + EVT_SIGNAL_EXIT_BOOT_SERVICES, TPL_CALLBACK, KillNtGopThread, Private, diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.c b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.c index 3de4a86..954c0e1 100644 --- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.c +++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.c @@ -637,7 +637,7 @@ Returns: WIN_NT_SERIAL_IO_PRIVATE_DATA *Private; EFI_TPL Tpl; - Tpl = gBS->RaiseTPL (EFI_TPL_NOTIFY); + Tpl = gBS->RaiseTPL (TPL_NOTIFY); Private = WIN_NT_SERIAL_IO_PRIVATE_DATA_FROM_THIS (This); @@ -709,7 +709,7 @@ Returns: EFI_DEVICE_PATH_PROTOCOL *NewDevicePath; EFI_TPL Tpl; - Tpl = gBS->RaiseTPL (EFI_TPL_NOTIFY); + Tpl = gBS->RaiseTPL (TPL_NOTIFY); Private = WIN_NT_SERIAL_IO_PRIVATE_DATA_FROM_THIS (This); @@ -906,7 +906,7 @@ Returns: DCB Dcb; EFI_TPL Tpl; - Tpl = gBS->RaiseTPL (EFI_TPL_NOTIFY); + Tpl = gBS->RaiseTPL (TPL_NOTIFY); Private = WIN_NT_SERIAL_IO_PRIVATE_DATA_FROM_THIS (This); @@ -996,7 +996,7 @@ Returns: DCB Dcb; EFI_TPL Tpl; - Tpl = gBS->RaiseTPL (EFI_TPL_NOTIFY); + Tpl = gBS->RaiseTPL (TPL_NOTIFY); Private = WIN_NT_SERIAL_IO_PRIVATE_DATA_FROM_THIS (This); @@ -1114,7 +1114,7 @@ Returns: UINT32 Control; EFI_TPL Tpl; - Tpl = gBS->RaiseTPL (EFI_TPL_NOTIFY); + Tpl = gBS->RaiseTPL (TPL_NOTIFY); Private = WIN_NT_SERIAL_IO_PRIVATE_DATA_FROM_THIS (This); @@ -1216,7 +1216,7 @@ Returns: UINT32 Control; EFI_TPL Tpl; - Tpl = gBS->RaiseTPL (EFI_TPL_NOTIFY); + Tpl = gBS->RaiseTPL (TPL_NOTIFY); Private = WIN_NT_SERIAL_IO_PRIVATE_DATA_FROM_THIS (This); diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.c b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.c index eb7b434..475dff6 100644 --- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.c +++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.c @@ -478,7 +478,7 @@ Returns: return EFI_INVALID_PARAMETER; } - OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK); + OldTpl = gBS->RaiseTPL (TPL_CALLBACK); Private = WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE_DATA_FROM_THIS (This); @@ -1081,7 +1081,7 @@ Returns: return EFI_INVALID_PARAMETER; } - OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK); + OldTpl = gBS->RaiseTPL (TPL_CALLBACK); PrivateFile = WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS (This); @@ -1143,7 +1143,7 @@ Returns: return EFI_INVALID_PARAMETER; } - OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK); + OldTpl = gBS->RaiseTPL (TPL_CALLBACK); PrivateFile = WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS (This); @@ -1277,7 +1277,7 @@ Returns: return EFI_INVALID_PARAMETER; } - OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK); + OldTpl = gBS->RaiseTPL (TPL_CALLBACK); PrivateFile = WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS (This); @@ -1486,7 +1486,7 @@ Returns: return EFI_INVALID_PARAMETER; } - OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK); + OldTpl = gBS->RaiseTPL (TPL_CALLBACK); PrivateFile = WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS (This); @@ -1560,7 +1560,7 @@ Returns: return EFI_INVALID_PARAMETER; } - OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK); + OldTpl = gBS->RaiseTPL (TPL_CALLBACK); PrivateFile = WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS (This); @@ -1648,7 +1648,7 @@ Returns: return EFI_INVALID_PARAMETER; } - OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK); + OldTpl = gBS->RaiseTPL (TPL_CALLBACK); PrivateFile = WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS (This); PositionHigh = 0; @@ -1913,7 +1913,7 @@ Returns: return EFI_INVALID_PARAMETER; } - OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK); + OldTpl = gBS->RaiseTPL (TPL_CALLBACK); PrivateFile = WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS (This); PrivateRoot = WIN_NT_SIMPLE_FILE_SYSTEM_PRIVATE_DATA_FROM_THIS (PrivateFile->SimpleFileSystem); @@ -2115,7 +2115,7 @@ Returns: return EFI_INVALID_PARAMETER; } - OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK); + OldTpl = gBS->RaiseTPL (TPL_CALLBACK); // // Initialise locals. @@ -2643,7 +2643,7 @@ Returns: return EFI_INVALID_PARAMETER; } - OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK); + OldTpl = gBS->RaiseTPL (TPL_CALLBACK); PrivateFile = WIN_NT_EFI_FILE_PRIVATE_DATA_FROM_THIS (This); diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUgaInput.c b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUgaInput.c index 19bca36..2c715c6 100644 --- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUgaInput.c +++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUgaInput.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,13 +15,13 @@ Module Name: Abstract: - This file produces the Simple Text In for an Uga window. + This file produces the Simple Text In for an Uga window. This stuff is linked at the hip to the Window, since the window processing is done in a thread kicked off in WinNtUgaImplementation.c Since the window information is processed in an other thread we need - a keyboard Queue to pass data about. The Simple Text In code just + a keyboard Queue to pass data about. The Simple Text In code just takes data off the Queue. The WinProc message loop takes keyboard input and places it in the Queue. @@ -222,7 +222,7 @@ Returns: // // Enter critical section // - OldTpl = gBS->RaiseTPL (EFI_TPL_NOTIFY); + OldTpl = gBS->RaiseTPL (TPL_NOTIFY); // // A reset is draining the Queue @@ -270,7 +270,7 @@ Returns: // // Enter critical section // - OldTpl = gBS->RaiseTPL (EFI_TPL_NOTIFY); + OldTpl = gBS->RaiseTPL (TPL_NOTIFY); Status = UgaPrivateCheckQ (Private); if (!EFI_ERROR (Status)) { @@ -321,7 +321,7 @@ Returns: // // Enter critical section // - OldTpl = gBS->RaiseTPL (EFI_TPL_NOTIFY); + OldTpl = gBS->RaiseTPL (TPL_NOTIFY); Status = UgaPrivateCheckQ (Private); if (!EFI_ERROR (Status)) { @@ -376,8 +376,8 @@ Returns: Private->SimpleTextIn.ReadKeyStroke = WinNtUgaSimpleTextInReadKeyStroke; Status = gBS->CreateEvent ( - EFI_EVENT_NOTIFY_WAIT, - EFI_TPL_NOTIFY, + EVT_NOTIFY_WAIT, + TPL_NOTIFY, WinNtUgaSimpleTextInWaitForKey, Private, &Private->SimpleTextIn.WaitForKey diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUgaScreen.c b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUgaScreen.c index b6c1ce2..ebaf0b3 100644 --- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUgaScreen.c +++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Uga/WinNtUgaScreen.c @@ -362,7 +362,7 @@ WinNtUgaBlt ( // We would not want a timer based event (Cursor, ...) to come in while we are // doing this operation. // - OriginalTPL = gBS->RaiseTPL (EFI_TPL_NOTIFY); + OriginalTPL = gBS->RaiseTPL (TPL_NOTIFY); for (SrcY = SourceY, DstY = DestinationY; DstY < (Height + DestinationY); SrcY++, DstY++) { Blt = (EFI_UGA_PIXEL *) ((UINT8 *) BltBuffer + (DstY * Delta) + DestinationX * sizeof (EFI_UGA_PIXEL)); @@ -386,7 +386,7 @@ WinNtUgaBlt ( // We would not want a timer based event (Cursor, ...) to come in while we are // doing this operation. // - OriginalTPL = gBS->RaiseTPL (EFI_TPL_NOTIFY); + OriginalTPL = gBS->RaiseTPL (TPL_NOTIFY); if (BltOperation == EfiUgaVideoFill) { FillPixel = BltBuffer; @@ -851,8 +851,8 @@ Returns: // Register to be notified on exit boot services so we can destroy the window. // Status = gBS->CreateEvent ( - EFI_EVENT_SIGNAL_EXIT_BOOT_SERVICES, - EFI_TPL_CALLBACK, + EVT_SIGNAL_EXIT_BOOT_SERVICES, + TPL_CALLBACK, KillNtUgaThread, Private, &mUgaScreenExitBootServicesEvent diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.c b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.c index 18779a6..3997c5f 100644 --- a/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.c +++ b/EdkNt32Pkg/Dxe/WinNtThunk/Chipset/Timer/Timer.c @@ -167,7 +167,7 @@ Returns: // if (Delta < 1000) { - OriginalTPL = gBS->RaiseTPL (EFI_TPL_HIGH_LEVEL); + OriginalTPL = gBS->RaiseTPL (TPL_HIGH_LEVEL); // // Inform the firmware of an "timer interrupt". The time diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.c b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.c index c777ec7..d732a5c 100644 --- a/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.c +++ b/EdkNt32Pkg/Dxe/WinNtThunk/Cpu/Cpu.c @@ -454,8 +454,8 @@ Returns: // Install notify function to store processor data to HII database and data hub. // Status = gBS->CreateEvent ( - EFI_EVENT_NOTIFY_SIGNAL, - EFI_TPL_CALLBACK, + EVT_NOTIFY_SIGNAL, + TPL_CALLBACK, WinNtIoProtocolNotifyFunction, ImageHandle, &Event diff --git a/EdkNt32Pkg/RuntimeDxe/FvbServices/FWBlockService.c b/EdkNt32Pkg/RuntimeDxe/FvbServices/FWBlockService.c index e71fada..531194e 100644 --- a/EdkNt32Pkg/RuntimeDxe/FvbServices/FWBlockService.c +++ b/EdkNt32Pkg/RuntimeDxe/FvbServices/FWBlockService.c @@ -1360,7 +1360,7 @@ Returns: CopyMem ((UINTN *) &(FwhInstance->VolumeHeader), (UINTN *) FwVolHeader, FwVolHeader->HeaderLength); FwVolHeader = &(FwhInstance->VolumeHeader); - EfiInitializeLock (&(FwhInstance->FvbDevLock), EFI_TPL_HIGH_LEVEL); + EfiInitializeLock (&(FwhInstance->FvbDevLock), TPL_HIGH_LEVEL); NumOfBlocks = 0; -- cgit v1.1