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 | 28 ++++++------ EdkUnixPkg/Dxe/UnixThunk/Bus/BlockIo/UnixBlockIo.c | 8 ++-- EdkUnixPkg/Dxe/UnixThunk/Bus/Console/ConsoleIn.c | 28 ++++++------ .../Dxe/UnixThunk/Bus/SerialIo/UnixSerialIo.c | 12 ++--- .../Bus/SimpleFileSystem/UnixSimpleFileSystem.c | 20 ++++----- EdkUnixPkg/Dxe/UnixThunk/Bus/Uga/UnixUgaInput.c | 30 ++++++------- EdkUnixPkg/Dxe/UnixThunk/Bus/Uga/UnixUgaScreen.c | 50 ++++++++++----------- EdkUnixPkg/Dxe/UnixThunk/Chipset/Timer/Timer.c | 4 +- EdkUnixPkg/Dxe/UnixThunk/Cpu/Cpu.c | 52 +++++++++++----------- EdkUnixPkg/RuntimeDxe/FvbServices/FWBlockService.c | 2 +- 10 files changed, 117 insertions(+), 117 deletions(-) (limited to 'EdkUnixPkg') diff --git a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSubclassDriverEntryPoint.c b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSubclassDriverEntryPoint.c index 910564d365..0feb1372f6 100644 --- a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSubclassDriverEntryPoint.c +++ b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSubclassDriverEntryPoint.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: MiscSubclassDriverEntryPoint.c - -Abstract: + +Abstract: This driver parses the mMiscSubclassDataTable structure and reports any generated data to the DataHub. @@ -321,8 +321,8 @@ Returns: // Install notify function to fetch memory data through UnixIo protocol and store to data hub. // EfiStatus = gBS->CreateEvent ( - EFI_EVENT_NOTIFY_SIGNAL, - EFI_TPL_CALLBACK, + EVT_NOTIFY_SIGNAL, + TPL_CALLBACK, UnixIoProtocolNotifyFunction, ImageHandle, &Event @@ -351,8 +351,8 @@ Routine Description: Arguments: String - Unicode string. -Returns: - UINTN of the number represented by String. +Returns: + UINTN of the number represented by String. --*/ { diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/BlockIo/UnixBlockIo.c b/EdkUnixPkg/Dxe/UnixThunk/Bus/BlockIo/UnixBlockIo.c index 0167220470..2ddc9e5bab 100644 --- a/EdkUnixPkg/Dxe/UnixThunk/Bus/BlockIo/UnixBlockIo.c +++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/BlockIo/UnixBlockIo.c @@ -679,7 +679,7 @@ Returns: ); ASSERT_EFI_ERROR (Status); - EfiInitializeLock (&Private->Lock, EFI_TPL_NOTIFY); + EfiInitializeLock (&Private->Lock, TPL_NOTIFY); Private->UnixThunk = UnixIo->UnixThunk; @@ -1066,7 +1066,7 @@ UnixBlockIoReadBlocks ( EFI_STATUS Status; EFI_TPL OldTpl; - OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK); + OldTpl = gBS->RaiseTPL (TPL_CALLBACK); Private = UNIX_BLOCK_IO_PRIVATE_DATA_FROM_THIS (This); @@ -1133,7 +1133,7 @@ UnixBlockIoWriteBlocks ( EFI_STATUS Status; EFI_TPL OldTpl; - OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK); + OldTpl = gBS->RaiseTPL (TPL_CALLBACK); Private = UNIX_BLOCK_IO_PRIVATE_DATA_FROM_THIS (This); @@ -1211,7 +1211,7 @@ UnixBlockIoResetBlock ( UNIX_BLOCK_IO_PRIVATE *Private; EFI_TPL OldTpl; - OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK); + OldTpl = gBS->RaiseTPL (TPL_CALLBACK); Private = UNIX_BLOCK_IO_PRIVATE_DATA_FROM_THIS (This); diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/Console/ConsoleIn.c b/EdkUnixPkg/Dxe/UnixThunk/Bus/Console/ConsoleIn.c index 0a7503fe6e..3167949669 100644 --- a/EdkUnixPkg/Dxe/UnixThunk/Bus/Console/ConsoleIn.c +++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/Console/ConsoleIn.c @@ -1,13 +1,13 @@ /*++ -Copyright (c) 2004, 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) 2004, 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,15 +15,15 @@ Module Name: Abstract: - Console based on Posix APIs. + Console based on Posix APIs. This file attaches a SimpleTextIn protocol to a previously open window. - + The constructor for this protocol depends on an open window. Currently the SimpleTextOut protocol creates a window when it's constructor is called. - Thus this code must run after the constructor for the SimpleTextOut + Thus this code must run after the constructor for the SimpleTextOut protocol - + --*/ #include "Console.h" @@ -234,8 +234,8 @@ Returns: Private->SimpleTextIn.ReadKeyStroke = UnixSimpleTextInReadKeyStroke; Status = gBS->CreateEvent ( - EFI_EVENT_NOTIFY_WAIT, - EFI_TPL_NOTIFY, + EVT_NOTIFY_WAIT, + TPL_NOTIFY, UnixSimpleTextInWaitForKey, Private, &Private->SimpleTextIn.WaitForKey diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/SerialIo/UnixSerialIo.c b/EdkUnixPkg/Dxe/UnixThunk/Bus/SerialIo/UnixSerialIo.c index e3fd034ab3..9f550f25c0 100644 --- a/EdkUnixPkg/Dxe/UnixThunk/Bus/SerialIo/UnixSerialIo.c +++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/SerialIo/UnixSerialIo.c @@ -770,7 +770,7 @@ Returns: EFI_TPL Tpl; UINTN UnixStatus; - Tpl = gBS->RaiseTPL (EFI_TPL_NOTIFY); + Tpl = gBS->RaiseTPL (TPL_NOTIFY); Private = UNIX_SERIAL_IO_PRIVATE_DATA_FROM_THIS (This); @@ -844,7 +844,7 @@ Returns: EFI_TPL Tpl; EFI_DEVICE_PATH_PROTOCOL *NewDevicePath; - Tpl = gBS->RaiseTPL (EFI_TPL_NOTIFY); + Tpl = gBS->RaiseTPL (TPL_NOTIFY); Private = UNIX_SERIAL_IO_PRIVATE_DATA_FROM_THIS (This); // @@ -1037,7 +1037,7 @@ Returns: struct termios Options; EFI_TPL Tpl; - Tpl = gBS->RaiseTPL (EFI_TPL_NOTIFY); + Tpl = gBS->RaiseTPL (TPL_NOTIFY); Private = UNIX_SERIAL_IO_PRIVATE_DATA_FROM_THIS (This); @@ -1119,7 +1119,7 @@ Returns: EFI_TPL Tpl; UINTN Bytes; - Tpl = gBS->RaiseTPL (EFI_TPL_NOTIFY); + Tpl = gBS->RaiseTPL (TPL_NOTIFY); Private = UNIX_SERIAL_IO_PRIVATE_DATA_FROM_THIS (This); Result = Private->UnixThunk->IoCtl (Private->UnixHandle, TIOCMGET, &Status); @@ -1218,7 +1218,7 @@ Returns: UINT32 Control; EFI_TPL Tpl; - Tpl = gBS->RaiseTPL (EFI_TPL_NOTIFY); + Tpl = gBS->RaiseTPL (TPL_NOTIFY); Private = UNIX_SERIAL_IO_PRIVATE_DATA_FROM_THIS (This); @@ -1309,7 +1309,7 @@ Returns: UINT32 Control; EFI_TPL Tpl; - Tpl = gBS->RaiseTPL (EFI_TPL_NOTIFY); + Tpl = gBS->RaiseTPL (TPL_NOTIFY); Private = UNIX_SERIAL_IO_PRIVATE_DATA_FROM_THIS (This); diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/SimpleFileSystem/UnixSimpleFileSystem.c b/EdkUnixPkg/Dxe/UnixThunk/Bus/SimpleFileSystem/UnixSimpleFileSystem.c index b8030edce6..58cfefb0f3 100644 --- a/EdkUnixPkg/Dxe/UnixThunk/Bus/SimpleFileSystem/UnixSimpleFileSystem.c +++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/SimpleFileSystem/UnixSimpleFileSystem.c @@ -500,7 +500,7 @@ Returns: if (This == NULL || Root == NULL) { return EFI_INVALID_PARAMETER; } - OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK); + OldTpl = gBS->RaiseTPL (TPL_CALLBACK); Private = UNIX_SIMPLE_FILE_SYSTEM_PRIVATE_DATA_FROM_THIS (This); @@ -989,7 +989,7 @@ Returns: PrivateFile = UNIX_EFI_FILE_PRIVATE_DATA_FROM_THIS (This); - OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK); + OldTpl = gBS->RaiseTPL (TPL_CALLBACK); if (PrivateFile->fd >= 0) { PrivateFile->UnixThunk->Close (PrivateFile->fd); @@ -1044,7 +1044,7 @@ Returns: return EFI_INVALID_PARAMETER; } - OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK); + OldTpl = gBS->RaiseTPL (TPL_CALLBACK); PrivateFile = UNIX_EFI_FILE_PRIVATE_DATA_FROM_THIS (This); @@ -1268,7 +1268,7 @@ Returns: return EFI_INVALID_PARAMETER; } - OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK); + OldTpl = gBS->RaiseTPL (TPL_CALLBACK); PrivateFile = UNIX_EFI_FILE_PRIVATE_DATA_FROM_THIS (This); @@ -1401,7 +1401,7 @@ Returns: return EFI_INVALID_PARAMETER; } - OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK); + OldTpl = gBS->RaiseTPL (TPL_CALLBACK); PrivateFile = UNIX_EFI_FILE_PRIVATE_DATA_FROM_THIS (This); @@ -1473,7 +1473,7 @@ Returns: return EFI_INVALID_PARAMETER; } - OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK); + OldTpl = gBS->RaiseTPL (TPL_CALLBACK); PrivateFile = UNIX_EFI_FILE_PRIVATE_DATA_FROM_THIS (This); @@ -1539,7 +1539,7 @@ Returns: return EFI_INVALID_PARAMETER; } - OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK); + OldTpl = gBS->RaiseTPL (TPL_CALLBACK); PrivateFile = UNIX_EFI_FILE_PRIVATE_DATA_FROM_THIS (This); @@ -1609,7 +1609,7 @@ Returns: return EFI_INVALID_PARAMETER; } - OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK); + OldTpl = gBS->RaiseTPL (TPL_CALLBACK); PrivateFile = UNIX_EFI_FILE_PRIVATE_DATA_FROM_THIS (This); PrivateRoot = UNIX_SIMPLE_FILE_SYSTEM_PRIVATE_DATA_FROM_THIS (PrivateFile->SimpleFileSystem); @@ -1741,7 +1741,7 @@ Returns: return EFI_INVALID_PARAMETER; } - OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK); + OldTpl = gBS->RaiseTPL (TPL_CALLBACK); // // Initialise locals. @@ -2152,7 +2152,7 @@ Returns: } Status = EFI_SUCCESS; - OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK); + OldTpl = gBS->RaiseTPL (TPL_CALLBACK); PrivateFile = UNIX_EFI_FILE_PRIVATE_DATA_FROM_THIS (This); diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/Uga/UnixUgaInput.c b/EdkUnixPkg/Dxe/UnixThunk/Bus/Uga/UnixUgaInput.c index babfa4bdac..9158a45c2e 100644 --- a/EdkUnixPkg/Dxe/UnixThunk/Bus/Uga/UnixUgaInput.c +++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/Uga/UnixUgaInput.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 UnixUgaImplementation.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. @@ -68,7 +68,7 @@ Returns: // // Enter critical section // - OldTpl = gBS->RaiseTPL (EFI_TPL_NOTIFY); + OldTpl = gBS->RaiseTPL (TPL_NOTIFY); // // A reset is draining the Queue @@ -119,7 +119,7 @@ Returns: // // Enter critical section // - OldTpl = gBS->RaiseTPL (EFI_TPL_NOTIFY); + OldTpl = gBS->RaiseTPL (TPL_NOTIFY); Status = Private->UgaIo->UgaGetKey(Private->UgaIo, Key); // @@ -166,7 +166,7 @@ Returns: // // Enter critical section // - OldTpl = gBS->RaiseTPL (EFI_TPL_NOTIFY); + OldTpl = gBS->RaiseTPL (TPL_NOTIFY); Status = Private->UgaIo->UgaCheckKey(Private->UgaIo); if (!EFI_ERROR (Status)) { @@ -210,8 +210,8 @@ Returns: Private->SimpleTextIn.ReadKeyStroke = UnixUgaSimpleTextInReadKeyStroke; Status = gBS->CreateEvent ( - EFI_EVENT_NOTIFY_WAIT, - EFI_TPL_NOTIFY, + EVT_NOTIFY_WAIT, + TPL_NOTIFY, UnixUgaSimpleTextInWaitForKey, Private, &Private->SimpleTextIn.WaitForKey diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/Uga/UnixUgaScreen.c b/EdkUnixPkg/Dxe/UnixThunk/Bus/Uga/UnixUgaScreen.c index 85c23f0d8f..10efc5e3d6 100644 --- a/EdkUnixPkg/Dxe/UnixThunk/Bus/Uga/UnixUgaScreen.c +++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/Uga/UnixUgaScreen.c @@ -1,22 +1,22 @@ /*++ -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: - + UnixUgaScreen.c Abstract: - This file produces the graphics abstration of UGA. It is called by - UnixUgaDriver.c file which deals with the EFI 1.1 driver model. + This file produces the graphics abstration of UGA. It is called by + UnixUgaDriver.c file which deals with the EFI 1.1 driver model. This file just does graphics. --*/ @@ -71,7 +71,7 @@ UnixUgaGetMode ( Returns: EFI_SUCCESS - Mode information returned. - EFI_NOT_STARTED - Video display is not initialized. Call SetMode () + EFI_NOT_STARTED - Video display is not initialized. Call SetMode () EFI_INVALID_PARAMETER - One of the input args was NULL. --*/ @@ -122,7 +122,7 @@ UnixUgaSetMode ( Returns: EFI_SUCCESS - Mode information returned. - EFI_NOT_STARTED - Video display is not initialized. Call SetMode () + EFI_NOT_STARTED - Video display is not initialized. Call SetMode () EFI_INVALID_PARAMETER - One of the input args was NULL. --*/ @@ -196,19 +196,19 @@ UnixUgaBlt ( Routine Description: Blt pixels from the rectangle (Width X Height) formed by the BltBuffer onto the graphics screen starting a location (X, Y). (0, 0) is defined as - the upper left hand side of the screen. (X, Y) can be outside of the - current screen geometry and the BltBuffer will be cliped when it is - displayed. X and Y can be negative or positive. If Width or Height is + the upper left hand side of the screen. (X, Y) can be outside of the + current screen geometry and the BltBuffer will be cliped when it is + displayed. X and Y can be negative or positive. If Width or Height is bigger than the current video screen the image will be clipped. Arguments: This - Protocol instance pointer. - X - X location on graphics screen. + X - X location on graphics screen. Y - Y location on the graphics screen. Width - Width of BltBuffer. Height - Hight of BltBuffer BltOperation - Operation to perform on BltBuffer and video memory - BltBuffer - Buffer containing data to blt into video buffer. This + BltBuffer - Buffer containing data to blt into video buffer. This buffer has a size of Width*Height*sizeof(EFI_UGA_PIXEL) SourceX - If the BltOperation is a EfiCopyBlt this is the source of the copy. For other BLT operations this argument is not @@ -216,11 +216,11 @@ UnixUgaBlt ( SourceX - If the BltOperation is a EfiCopyBlt this is the source of the copy. For other BLT operations this argument is not used. - + Returns: EFI_SUCCESS - The palette is updated with PaletteArray. EFI_INVALID_PARAMETER - BltOperation is not valid. - EFI_DEVICE_ERROR - A hardware error occured writting to the video + EFI_DEVICE_ERROR - A hardware error occured writting to the video buffer. --*/ @@ -256,7 +256,7 @@ UnixUgaBlt ( // 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); Status = Private->UgaIo->UgaBlt (Private->UgaIo, BltBuffer, @@ -348,8 +348,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 @@ -426,8 +426,8 @@ KillNtUgaThread ( /*++ Routine Description: - - This is the UGA screen's callback notification function for exit-boot-services. + + This is the UGA screen's callback notification function for exit-boot-services. All we do here is call UnixUgaDestructor(). Arguments: diff --git a/EdkUnixPkg/Dxe/UnixThunk/Chipset/Timer/Timer.c b/EdkUnixPkg/Dxe/UnixThunk/Chipset/Timer/Timer.c index 37fdde5ed3..652594d277 100644 --- a/EdkUnixPkg/Dxe/UnixThunk/Chipset/Timer/Timer.c +++ b/EdkUnixPkg/Dxe/UnixThunk/Chipset/Timer/Timer.c @@ -77,9 +77,9 @@ Returns: EFI_TIMER_NOTIFY CallbackFunction; - OriginalTPL = gBS->RaiseTPL (EFI_TPL_HIGH_LEVEL); + OriginalTPL = gBS->RaiseTPL (TPL_HIGH_LEVEL); - if (OriginalTPL < EFI_TPL_HIGH_LEVEL) { + if (OriginalTPL < TPL_HIGH_LEVEL) { CallbackFunction = mTimerNotifyFunction; // diff --git a/EdkUnixPkg/Dxe/UnixThunk/Cpu/Cpu.c b/EdkUnixPkg/Dxe/UnixThunk/Cpu/Cpu.c index af27d7baa1..af207567d0 100644 --- a/EdkUnixPkg/Dxe/UnixThunk/Cpu/Cpu.c +++ b/EdkUnixPkg/Dxe/UnixThunk/Cpu/Cpu.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: @@ -114,7 +114,7 @@ UnixEnableInterrupt ( Routine Description: This routine provides support for emulation of the interrupt enable of the - the system. For our purposes, CPU enable is just a BOOLEAN that the Timer + the system. For our purposes, CPU enable is just a BOOLEAN that the Timer Architectural Protocol observes in order to defer behaviour while in its emulated interrupt, or timer tick. @@ -148,7 +148,7 @@ UnixDisableInterrupt ( Routine Description: This routine provides support for emulation of the interrupt disable of the - the system. For our purposes, CPU enable is just a BOOLEAN that the Timer + the system. For our purposes, CPU enable is just a BOOLEAN that the Timer Architectural Protocol observes in order to defer behaviour while in its emulated interrupt, or timer tick. @@ -183,7 +183,7 @@ UnixGetInterruptState ( Routine Description: This routine provides support for emulation of the interrupt disable of the - the system. For our purposes, CPU enable is just a BOOLEAN that the Timer + the system. For our purposes, CPU enable is just a BOOLEAN that the Timer Architectural Protocol observes in order to defer behaviour while in its emulated interrupt, or timer tick. @@ -223,8 +223,8 @@ UnixInit ( Routine Description: - This routine would support generation of a CPU INIT. At - present, this code does not provide emulation. + This routine would support generation of a CPU INIT. At + present, this code does not provide emulation. Arguments: @@ -258,8 +258,8 @@ UnixRegisterInterruptHandler ( Routine Description: - This routine would support registration of an interrupt handler. At - present, this code does not provide emulation. + This routine would support registration of an interrupt handler. At + present, this code does not provide emulation. Arguments: @@ -305,8 +305,8 @@ UnixGetTimerValue ( Routine Description: - This routine would support querying of an on-CPU timer. At present, - this code does not provide timer emulation. + This routine would support querying of an on-CPU timer. At present, + this code does not provide timer emulation. Arguments: @@ -325,7 +325,7 @@ Returns: if (TimerValue == NULL) { return EFI_INVALID_PARAMETER; } - + // // No timer supported // @@ -345,8 +345,8 @@ UnixSetMemoryAttributes ( Routine Description: - This routine would support querying of an on-CPU timer. At present, - this code does not provide timer emulation. + This routine would support querying of an on-CPU timer. At present, + this code does not provide timer emulation. Arguments: @@ -405,7 +405,7 @@ Returns: Status - EFI_SUCCESS - protocol instance can be published + EFI_SUCCESS - protocol instance can be published EFI_OUT_OF_RESOURCES - cannot allocate protocol data structure EFI_DEVICE_ERROR - cannot create the thread @@ -458,8 +458,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, UnixIoProtocolNotifyFunction, ImageHandle, &Event @@ -479,7 +479,7 @@ Returns: DEBUG ((EFI_D_ERROR, "CPU Architectural Protocol Loaded\n")); - + return Status; } @@ -495,8 +495,8 @@ Routine Description: Arguments: String - Unicode string. -Returns: - UINTN of the number represented by String. +Returns: + UINTN of the number represented by String. --*/ { diff --git a/EdkUnixPkg/RuntimeDxe/FvbServices/FWBlockService.c b/EdkUnixPkg/RuntimeDxe/FvbServices/FWBlockService.c index fad36f8f0e..7cb85a6a50 100644 --- a/EdkUnixPkg/RuntimeDxe/FvbServices/FWBlockService.c +++ b/EdkUnixPkg/RuntimeDxe/FvbServices/FWBlockService.c @@ -1368,7 +1368,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.2.3