diff options
88 files changed, 2030 insertions, 2023 deletions
diff --git a/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430UgaDraw.c b/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430UgaDraw.c index e71ec8e..056d115 100644 --- a/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430UgaDraw.c +++ b/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430UgaDraw.c @@ -321,7 +321,7 @@ CirrusLogic5430UgaDrawBlt ( // 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);
switch (BltOperation) {
case EfiUgaVideoToBltBuffer:
diff --git a/EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.c b/EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.c index cb89e17..9065a2a 100644 --- a/EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.c +++ b/EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.c @@ -2138,7 +2138,7 @@ EhciAsyncInterruptTransfer ( //
if (!IsNewTransfer) {
- OldTpl = gBS->RaiseTPL (EFI_TPL_NOTIFY);
+ OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
Status = DeleteAsyncRequestTransfer (
HcDev,
diff --git a/EdkModulePkg/Bus/Pci/Ehci/Dxe/EhciMem.c b/EdkModulePkg/Bus/Pci/Ehci/Dxe/EhciMem.c index 24a4616..db7412b 100644 --- a/EdkModulePkg/Bus/Pci/Ehci/Dxe/EhciMem.c +++ b/EdkModulePkg/Bus/Pci/Ehci/Dxe/EhciMem.c @@ -239,7 +239,7 @@ Returns: MemoryHeader = HcDev->MemoryHeader;
ASSERT (MemoryHeader != NULL);
- OldTpl = gBS->RaiseTPL (EFI_TPL_NOTIFY + 1);
+ OldTpl = gBS->RaiseTPL (TPL_NOTIFY + 1);
//
// allocate unit is 32 bytes (align on 32 byte)
@@ -297,7 +297,7 @@ Returns: return Status;
}
- OldTpl = gBS->RaiseTPL (EFI_TPL_NOTIFY + 1);
+ OldTpl = gBS->RaiseTPL (TPL_NOTIFY + 1);
//
// Link the new Memory Block to the Memory Header list
@@ -353,7 +353,7 @@ Returns: UINTN RealAllocSize;
EFI_TPL OldTpl;
- OldTpl = gBS->RaiseTPL (EFI_TPL_NOTIFY + 1);
+ OldTpl = gBS->RaiseTPL (TPL_NOTIFY + 1);
MemoryHeader = HcDev->MemoryHeader;
@@ -419,7 +419,7 @@ Returns: //
gBS->RestoreTPL (OldTpl);
FreeMemoryHeader (HcDev, TempHeaderPtr);
- OldTpl = gBS->RaiseTPL (EFI_TPL_NOTIFY + 1);
+ OldTpl = gBS->RaiseTPL (TPL_NOTIFY + 1);
//
// reset the TempHeaderPtr, continue search for
// another empty memory block.
diff --git a/EdkModulePkg/Bus/Pci/Ehci/Dxe/EhciSched.c b/EdkModulePkg/Bus/Pci/Ehci/Dxe/EhciSched.c index 448fe20..4e4a54c 100644 --- a/EdkModulePkg/Bus/Pci/Ehci/Dxe/EhciSched.c +++ b/EdkModulePkg/Bus/Pci/Ehci/Dxe/EhciSched.c @@ -253,7 +253,7 @@ Returns: //
if (HcDev->Is64BitCapable != 0) {
HcDev->High32BitAddr = (UINT32) GET_32B_TO_63B (FrameBuffer);
-
+
Status = SetCtrlDataStructSeg (HcDev);
if (EFI_ERROR (Status)) {
DEBUG ((gEHCErrorLevel, "EHCI: SetCtrlDataStructSeg Failed\n"));
@@ -347,8 +347,8 @@ Returns: --*/
{
return gBS->CreateEvent (
- EFI_EVENT_TIMER | EFI_EVENT_NOTIFY_SIGNAL,
- EFI_TPL_NOTIFY,
+ EVT_TIMER | EVT_NOTIFY_SIGNAL,
+ TPL_NOTIFY,
NotifyFunction,
HcDev,
&HcDev->AsyncRequestEvent
@@ -1868,7 +1868,7 @@ Returns: QhPtr->Qh.HeadReclamationFlag = FALSE;
if (QhPtr->TransferType == ASYNC_INTERRUPT_TRANSFER) {
-
+
//
// AsyncInterruptTransfer Qh
//
@@ -2596,7 +2596,7 @@ Returns: break;
default:
-
+
Status = EFI_INVALID_PARAMETER;
}
diff --git a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c index c1c1405..c45238c 100644 --- a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c +++ b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c @@ -1,12 +1,12 @@ /** @file
Copyright (c) 2006 - 2007 Intel Corporation. <BR>
- 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
+ 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.
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@par Revision Reference:
This module is modified from DXE\IDE module for Ide Contriller Init support
@@ -89,7 +89,7 @@ IDEBusDriverBindingSupported ( if (EFI_ERROR (Status)) {
return Status;
}
-
+
//
// Close protocol, don't use device path protocol in the .Support() function
//
@@ -140,7 +140,7 @@ IDEBusDriverBindingSupported ( // ***********************************************************************************
//
/**
- Start this driver on Controller by detecting all disks and installing
+ Start this driver on Controller by detecting all disks and installing
BlockIo protocol on them.
@param This Protocol instance pointer.
@@ -210,7 +210,7 @@ IDEBusDriverBindingStart ( if ((EFI_ERROR (Status)) && (Status != EFI_ALREADY_STARTED)) {
return Status;
}
-
+
//
// Now open the IDE_CONTROLLER_INIT protocol. Step7.1
//
@@ -429,7 +429,7 @@ IDEBusDriverBindingStart ( if (!(ConfigurationOptions & (1 << (IdeChannel * 2 + IdeDevice)))) {
continue;
}
-
+
//
// The device has been scanned in another Start(), No need to scan it again
// for perf optimization.
@@ -437,7 +437,7 @@ IDEBusDriverBindingStart ( if (IdeBusDriverPrivateData->HaveScannedDevice[IdeChannel * 2 + IdeDevice]) {
continue;
}
-
+
//
// create child handle for the detected device.
//
@@ -664,7 +664,7 @@ IDEBusDriverBindingStart ( if ((IdeBlkIoDevicePtr->Type == IdeHardDisk) || (IdeBlkIoDevicePtr->Type == Ide48bitAddressingHardDisk)) {
Status = SetDriveParameters (IdeBlkIoDevicePtr, &DriveParameters);
}
-
+
//
// Record PIO mode used in private data
//
@@ -715,13 +715,13 @@ IDEBusDriverBindingStart ( (EFI_IO_BUS_ATA_ATAPI | EFI_P_PC_ENABLE),
IdeBlkIoDevicePtr->DevicePath
);
-
+
//
// Create event to clear pending IDE interrupt
//
Status = gBS->CreateEvent (
- EFI_EVENT_SIGNAL_EXIT_BOOT_SERVICES,
- EFI_TPL_NOTIFY,
+ EVT_SIGNAL_EXIT_BOOT_SERVICES,
+ TPL_NOTIFY,
ClearInterrupt,
IdeBlkIoDevicePtr,
&IdeBlkIoDevicePtr->ExitBootServiceEvent
@@ -735,7 +735,7 @@ IDEBusDriverBindingStart ( // end of 2nd outer loop ==========
//
}
-
+
//
// All configurations done! Notify IdeController to do post initialization
// work such as saving IDE controller PCI settings for S3 resume
@@ -808,7 +808,7 @@ ErrorExit: // ***********************************************************************************
//
/**
- Stop this driver on Controller Handle.
+ Stop this driver on Controller Handle.
@param This Protocol instance pointer.
@param DeviceHandle Handle of device to stop driver on
@@ -1003,7 +1003,7 @@ DeRegisterIdeDevice ( );
return Status;
}
-
+
//
// Release allocated resources
//
@@ -1037,7 +1037,7 @@ IDEBlkIoReset ( EFI_STATUS Status;
EFI_TPL OldTpl;
- OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);
+ OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
IdeBlkIoDevice = IDE_BLOCK_IO_DEV_FROM_THIS (This);
//
@@ -1058,7 +1058,7 @@ IDEBlkIoReset ( Status = EFI_DEVICE_ERROR;
goto Done;
}
-
+
//
// for ATAPI device, using ATAPI reset method
//
@@ -1099,7 +1099,7 @@ IDEBlkIoReadBlocks ( EFI_STATUS Status;
EFI_TPL OldTpl;
- OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);
+ OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
IdeBlkIoDevice = IDE_BLOCK_IO_DEV_FROM_THIS (This);
@@ -1127,7 +1127,7 @@ IDEBlkIoReadBlocks ( Status = EFI_DEVICE_ERROR;
goto Done;
}
-
+
//
// for ATAPI device, using ATAPI read block's mechanism
//
@@ -1172,8 +1172,8 @@ IDEBlkIoWriteBlocks ( EFI_STATUS Status;
EFI_TPL OldTpl;
- OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);
-
+ OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
+
IdeBlkIoDevice = IDE_BLOCK_IO_DEV_FROM_THIS (This);
//
// Requery IDE IO resources in case of the switch of native and legacy modes
@@ -1184,7 +1184,7 @@ IDEBlkIoWriteBlocks ( // for ATA device, using ATA write block's mechanism
//
if (IdeBlkIoDevice->Type == IdeHardDisk ||
- IdeBlkIoDevice->Type == Ide48bitAddressingHardDisk) {
+ IdeBlkIoDevice->Type == Ide48bitAddressingHardDisk) {
Status = AtaBlkIoWriteBlocks (
IdeBlkIoDevice,
@@ -1200,7 +1200,7 @@ IDEBlkIoWriteBlocks ( Status = EFI_DEVICE_ERROR;
goto Done;
}
-
+
//
// for ATAPI device, using ATAPI write block's mechanism
//
@@ -1211,7 +1211,7 @@ IDEBlkIoWriteBlocks ( BufferSize,
Buffer
);
-
+
Done:
gBS->RestoreTPL (OldTpl);
return Status;
diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciEnumeratorSupport.c b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciEnumeratorSupport.c index 52a3a7b..8020ab1 100644 --- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciEnumeratorSupport.c +++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciEnumeratorSupport.c @@ -693,7 +693,7 @@ Returns: //
// Raise TPL to high level to disable timer interrupt while the BAR is probed
//
- OldTpl = gBS->RaiseTPL (EFI_TPL_HIGH_LEVEL);
+ OldTpl = gBS->RaiseTPL (TPL_HIGH_LEVEL);
PciIoWrite (PciIo, EfiPciIoWidthUint32, (UINT8) Offset, 1, &gAllOne);
PciIoRead (PciIo, EfiPciIoWidthUint32, (UINT8) Offset, 1, &Value);
@@ -759,7 +759,7 @@ Returns: //
// Raise TPL to high level to disable timer interrupt while the BAR is probed
//
- OldTpl = gBS->RaiseTPL (EFI_TPL_HIGH_LEVEL);
+ OldTpl = gBS->RaiseTPL (TPL_HIGH_LEVEL);
PciSetCommandRegister (PciIoDevice, *Command);
PciReadCommandRegister (PciIoDevice, Command);
@@ -784,7 +784,7 @@ Returns: //
// Raise TPL to high level to disable timer interrupt while the BAR is probed
//
- OldTpl = gBS->RaiseTPL (EFI_TPL_HIGH_LEVEL);
+ OldTpl = gBS->RaiseTPL (TPL_HIGH_LEVEL);
PciSetBridgeControlRegister (PciIoDevice, *BridgeControl);
PciReadBridgeControlRegister (PciIoDevice, BridgeControl);
diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciHotPlugSupport.c b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciHotPlugSupport.c index 7fba047..3ef1daf 100644 --- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciHotPlugSupport.c +++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciHotPlugSupport.c @@ -1,21 +1,21 @@ /*++
-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:
PciHotPlugSupport.c
-
+
Abstract:
-
+
Revision History
@@ -254,8 +254,8 @@ Returns: EFI_STATUS Status;
Status = gBS->CreateEvent (
- EFI_EVENT_NOTIFY_SIGNAL,
- EFI_TPL_CALLBACK,
+ EVT_NOTIFY_SIGNAL,
+ TPL_CALLBACK,
PciHPCInitialized,
gPciRootHpcData + HpIndex,
&((gPciRootHpcData + HpIndex)->Event)
diff --git a/EdkModulePkg/Bus/Pci/Uhci/Dxe/uhci.c b/EdkModulePkg/Bus/Pci/Uhci/Dxe/uhci.c index b3cb1f5..7cb9605 100644 --- a/EdkModulePkg/Bus/Pci/Uhci/Dxe/uhci.c +++ b/EdkModulePkg/Bus/Pci/Uhci/Dxe/uhci.c @@ -1,20 +1,20 @@ /*++
-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:
Uhci.c
-
-Abstract:
-
+
+Abstract:
+
Revision History
--*/
@@ -144,13 +144,13 @@ UHCIDriverBindingStart ( EFI_OUT_OF_RESOURCES
--*/
-{
- EFI_STATUS Status;
- UINTN FlBaseAddrReg;
- EFI_PCI_IO_PROTOCOL *PciIo;
+{
+ EFI_STATUS Status;
+ UINTN FlBaseAddrReg;
+ EFI_PCI_IO_PROTOCOL *PciIo;
USB_HC_DEV *HcDev;
UINT64 Supports;
-
+
HcDev = NULL;
Status = gBS->OpenProtocol (
@@ -249,10 +249,10 @@ UHCIDriverBindingStart ( HcDev->Usb2Hc.GetRootHubPortStatus = UHCI2GetRootHubPortStatus;
HcDev->Usb2Hc.SetRootHubPortFeature = UHCI2SetRootHubPortFeature;
HcDev->Usb2Hc.ClearRootHubPortFeature = UHCI2ClearRootHubPortFeature;
-
+
HcDev->Usb2Hc.MajorRevision = 0x1;
HcDev->Usb2Hc.MinorRevision = 0x1;
-
+
//
// Init UHCI private data structures
//
@@ -289,8 +289,8 @@ UHCIDriverBindingStart ( // Create timer for interrupt transfer result polling
//
Status = gBS->CreateEvent (
- EFI_EVENT_TIMER | EFI_EVENT_NOTIFY_SIGNAL,
- EFI_TPL_NOTIFY,
+ EVT_TIMER | EVT_NOTIFY_SIGNAL,
+ TPL_NOTIFY,
MonitorInterruptTrans,
HcDev,
&HcDev->InterruptTransTimer
@@ -337,7 +337,7 @@ UHCIDriverBindingStart ( );
return EFI_UNSUPPORTED;
}
-
+
//
// QH,TD structures must in common buffer that will be
// accessed by both cpu and usb bus master at the same time.
@@ -345,9 +345,9 @@ UHCIDriverBindingStart ( //
Status = InitializeMemoryManagement (HcDev);
if (EFI_ERROR (Status)) {
-
+
gBS->CloseEvent (HcDev->InterruptTransTimer);
-
+
FreeFrameListEntry (HcDev);
if (HcDev != NULL) {
@@ -355,9 +355,9 @@ UHCIDriverBindingStart ( }
gBS->CloseProtocol (
- Controller,
- &gEfiPciIoProtocolGuid,
- This->DriverBindingHandle,
+ Controller,
+ &gEfiPciIoProtocolGuid,
+ This->DriverBindingHandle,
Controller
);
return Status;
@@ -417,7 +417,7 @@ UHCIDriverBindingStart ( return Status;
}
-
+
//
// component name protocol.
//
@@ -461,13 +461,13 @@ UnInstallUHCInterface ( &gEfiUsbHcProtocolGuid,
&HcDev->UsbHc
);
-
+
gBS->UninstallProtocolInterface (
Controller,
&gEfiUsb2HcProtocolGuid,
&HcDev->Usb2Hc
);
- //
+ //
// first stop USB Host Controller
//
This->SetState (This, EfiUsbHcStateHalt);
@@ -610,35 +610,35 @@ UHCIReset ( IN UINT16 Attributes
)
/*++
-
+
Routine Description:
Provides software reset for the USB host controller.
-
+
Arguments:
-
- This A pointer to the EFI_USB_HC_PROTOCOL instance.
-
- Attributes A bit mask of the reset operation to perform.
+
+ This A pointer to the EFI_USB_HC_PROTOCOL instance.
+
+ Attributes A bit mask of the reset operation to perform.
See below for a list of the supported bit mask values.
-
+
#define EFI_USB_HC_RESET_GLOBAL 0x0001
#define EFI_USB_HC_RESET_HOST_CONTROLLER 0x0002
- EFI_USB_HC_RESET_GLOBAL
+ EFI_USB_HC_RESET_GLOBAL
If this bit is set, a global reset signal will be sent to the USB bus.
- This resets all of the USB bus logic, including the USB host
+ This resets all of the USB bus logic, including the USB host
controller hardware and all the devices attached on the USB bus.
- EFI_USB_HC_RESET_HOST_CONTROLLER
- If this bit is set, the USB host controller hardware will be reset.
+ EFI_USB_HC_RESET_HOST_CONTROLLER
+ If this bit is set, the USB host controller hardware will be reset.
No reset signal will be sent to the USB bus.
-
+
Returns:
- EFI_SUCCESS
+ EFI_SUCCESS
The reset operation succeeded.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
Attributes is not valid.
- EFI_DEVICE_ERROR
- An error was encountered while attempting to perform
+ EFI_DEVICE_ERROR
+ An error was encountered while attempting to perform
the reset operation.
--*/
{
@@ -736,7 +736,7 @@ UHCIReset ( if (!Match) {
return EFI_INVALID_PARAMETER;
}
-
+
//
// Delete all old transactions on the USB bus
//
@@ -767,33 +767,33 @@ UHCIGetState ( OUT EFI_USB_HC_STATE *State
)
/*++
-
+
Routine Description:
Retrieves current state of the USB host controller.
-
+
Arguments:
-
+
This A pointer to the EFI_USB_HC_PROTOCOL instance.
-
- State A pointer to the EFI_USB_HC_STATE data structure that
- indicates current state of the USB host controller.
+
+ State A pointer to the EFI_USB_HC_STATE data structure that
+ indicates current state of the USB host controller.
Type EFI_USB_HC_STATE is defined below.
-
+
typedef enum {
EfiUsbHcStateHalt,
EfiUsbHcStateOperational,
EfiUsbHcStateSuspend,
EfiUsbHcStateMaximum
} EFI_USB_HC_STATE;
-
+
Returns:
- EFI_SUCCESS
+ EFI_SUCCESS
The state information of the host controller was returned in State.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
State is NULL.
- EFI_DEVICE_ERROR
- An error was encountered while attempting to retrieve the
- host controller's current state.
+ EFI_DEVICE_ERROR
+ An error was encountered while attempting to retrieve the
+ host controller's current state.
--*/
{
USB_HC_DEV *HcDev;
@@ -853,24 +853,24 @@ UHCISetState ( IN EFI_USB_HC_STATE State
)
/*++
-
+
Routine Description:
Sets the USB host controller to a specific state.
-
+
Arguments:
-
+
This A pointer to the EFI_USB_HC_PROTOCOL instance.
State Indicates the state of the host controller that will be set.
-
+
Returns:
- EFI_SUCCESS
- The USB host controller was successfully placed in the state
+ EFI_SUCCESS
+ The USB host controller was successfully placed in the state
specified by State.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
State is invalid.
- EFI_DEVICE_ERROR
- Failed to set the state specified by State due to device error.
+ EFI_DEVICE_ERROR
+ Failed to set the state specified by State due to device error.
--*/
{
USB_HC_DEV *HcDev;
@@ -970,7 +970,7 @@ UHCISetState ( if (EFI_ERROR (Status)) {
return EFI_DEVICE_ERROR;
}
-
+
//
// FGR(Force Global Resume) bit is 0
//
@@ -985,7 +985,7 @@ UHCISetState ( Command
);
}
-
+
//
// wait 20ms to let resume complete
// (20ms is specified by UHCI spec)
@@ -1056,24 +1056,24 @@ UHCIGetRootHubPortNumber ( OUT UINT8 *PortNumber
)
/*++
-
+
Routine Description:
Retrieves the number of root hub ports.
-
+
Arguments:
-
+
This A pointer to the EFI_USB_HC_PROTOCOL instance.
-
+
PortNumber A pointer to the number of the root hub ports.
-
+
Returns:
- EFI_SUCCESS
+ EFI_SUCCESS
The port number was retrieved successfully.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
PortNumber is NULL.
- EFI_DEVICE_ERROR
- An error was encountered while attempting to
- retrieve the port number.
+ EFI_DEVICE_ERROR
+ An error was encountered while attempting to
+ retrieve the port number.
--*/
{
USB_HC_DEV *HcDev;
@@ -1119,29 +1119,29 @@ UHCIGetRootHubPortStatus ( OUT EFI_USB_PORT_STATUS *PortStatus
)
/*++
-
+
Routine Description:
Retrieves the current status of a USB root hub port.
-
+
Arguments:
-
+
This A pointer to the EFI_USB_HC_PROTOCOL.
-
- PortNumber Specifies the root hub port from which the status
- is to be retrieved. This value is zero-based. For example,
+
+ PortNumber Specifies the root hub port from which the status
+ is to be retrieved. This value is zero-based. For example,
if a root hub has two ports, then the first port is numbered 0,
and the second port is numbered 1.
-
- PortStatus A pointer to the current port status bits and
- port status change bits.
-
+
+ PortStatus A pointer to the current port status bits and
+ port status change bits.
+
Returns:
- EFI_SUCCESS
- The status of the USB root hub port specified by PortNumber
+ EFI_SUCCESS
+ The status of the USB root hub port specified by PortNumber
was returned in PortStatus.
- EFI_INVALID_PARAMETER
- PortNumber is invalid.
- EFI_DEVICE_ERROR - Can't read register
+ EFI_INVALID_PARAMETER
+ PortNumber is invalid.
+ EFI_DEVICE_ERROR - Can't read register
--*/
{
USB_HC_DEV *HcDev;
@@ -1180,7 +1180,7 @@ UHCIGetRootHubPortStatus ( //
// Fill Port Status bits
//
-
+
//
// Current Connect Status
//
@@ -1193,21 +1193,21 @@ UHCIGetRootHubPortStatus ( if (RHPortStatus & USBPORTSC_PED) {
PortStatus->PortStatus |= USB_PORT_STAT_ENABLE;
}
-
+
//
// Port Suspend
//
if (RHPortStatus & USBPORTSC_SUSP) {
PortStatus->PortStatus |= USB_PORT_STAT_SUSPEND;
}
-
+
//
// Port Reset
//
if (RHPortStatus & USBPORTSC_PR) {
PortStatus->PortStatus |= USB_PORT_STAT_RESET;
}
-
+
//
// Low Speed Device Attached
//
@@ -1221,14 +1221,14 @@ UHCIGetRootHubPortStatus ( //
// Fill Port Status Change bits
//
-
+
//
// Connect Status Change
//
if (RHPortStatus & USBPORTSC_CSC) {
PortStatus->PortChangeStatus |= USB_PORT_STAT_C_CONNECTION;
}
-
+
//
// Port Enabled/Disabled Change
//
@@ -1247,25 +1247,25 @@ UHCISetRootHubPortFeature ( IN EFI_USB_PORT_FEATURE PortFeature
)
/*++
-
+
Routine Description:
Sets a feature for the specified root hub port.
-
+
Arguments:
-
+
This A pointer to the EFI_USB_HC_PROTOCOL.
-
- PortNumber Specifies the root hub port whose feature
+
+ PortNumber Specifies the root hub port whose feature
is requested to be set.
-
- PortFeature Indicates the feature selector associated
- with the feature set request.
-
+
+ PortFeature Indicates the feature selector associated
+ with the feature set request.
+
Returns:
- EFI_SUCCESS
- The feature specified by PortFeature was set for the
+ EFI_SUCCESS
+ The feature specified by PortFeature was set for the
USB root hub port specified by PortNumber.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
PortNumber is invalid or PortFeature is invalid.
EFI_DEVICE_ERROR
Can't read register
@@ -1359,25 +1359,25 @@ UHCIClearRootHubPortFeature ( IN EFI_USB_PORT_FEATURE PortFeature
)
/*++
-
+
Routine Description:
Clears a feature for the specified root hub port.
-
+
Arguments:
-
+
This A pointer to the EFI_USB_HC_PROTOCOL instance.
-
- PortNumber Specifies the root hub port whose feature
+
+ PortNumber Specifies the root hub port whose feature
is requested to be cleared.
-
- PortFeature Indicates the feature selector associated with the
+
+ PortFeature Indicates the feature selector associated with the
feature clear request.
-
+
Returns:
- EFI_SUCCESS
- The feature specified by PortFeature was cleared for the
+ EFI_SUCCESS
+ The feature specified by PortFeature was cleared for the
USB root hub port specified by PortNumber.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
PortNumber is invalid or PortFeature is invalid.
EFI_DEVICE_ERROR
Can't read register
@@ -1501,54 +1501,54 @@ UHCIControlTransfer ( OUT UINT32 *TransferResult
)
/*++
-
+
Routine Description:
Submits control transfer to a target USB device.
-
+
Arguments:
-
+
This A pointer to the EFI_USB_HC_PROTOCOL instance.
DeviceAddress Represents the address of the target device on the USB,
which is assigned during USB enumeration.
- IsSlowDevice Indicates whether the target device is slow device
+ IsSlowDevice Indicates whether the target device is slow device
or full-speed device.
-
- MaximumPacketLength Indicates the maximum packet size that the
- default control transfer endpoint is capable of
+
+ MaximumPacketLength Indicates the maximum packet size that the
+ default control transfer endpoint is capable of
sending or receiving.
-
- Request A pointer to the USB device request that will be sent
- to the USB device.
-
+
+ Request A pointer to the USB device request that will be sent
+ to the USB device.
+
TransferDirection Specifies the data direction for the transfer.
- There are three values available, DataIn, DataOut
+ There are three values available, DataIn, DataOut
and NoData.
-
- Data A pointer to the buffer of data that will be transmitted
+
+ Data A pointer to the buffer of data that will be transmitted
to USB device or received from USB device.
-
- DataLength Indicates the size, in bytes, of the data buffer
+
+ DataLength Indicates the size, in bytes, of the data buffer
specified by Data.
-
- TimeOut Indicates the maximum time, in microseconds,
+
+ TimeOut Indicates the maximum time, in microseconds,
which the transfer is allowed to complete.
-
- TransferResult A pointer to the detailed result information generated
+
+ TransferResult A pointer to the detailed result information generated
by this control transfer.
-
+
Returns:
- EFI_SUCCESS
+ EFI_SUCCESS
The control transfer was completed successfully.
- EFI_OUT_OF_RESOURCES
+ EFI_OUT_OF_RESOURCES
The control transfer could not be completed due to a lack of resources.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
Some parameters are invalid.
- EFI_TIMEOUT
+ EFI_TIMEOUT
The control transfer failed due to timeout.
- EFI_DEVICE_ERROR
- The control transfer failed due to host controller or device error.
+ EFI_DEVICE_ERROR
+ The control transfer failed due to host controller or device error.
Caller should check TranferResult for detailed error information.
--*/
@@ -1602,7 +1602,7 @@ UHCIControlTransfer ( if (Request == NULL || TransferResult == NULL) {
return EFI_INVALID_PARAMETER;
}
-
+
//
// if errors exist that cause host controller halt,
// then return EFI_DEVICE_ERROR.
@@ -1613,7 +1613,7 @@ UHCIControlTransfer ( *TransferResult = EFI_USB_ERR_SYSTEM;
return EFI_DEVICE_ERROR;
}
-
+
//
// low speed usb devices are limited to only an eight-byte
// maximum data payload size
@@ -1622,7 +1622,7 @@ UHCIControlTransfer ( return EFI_INVALID_PARAMETER;
}
- if (MaximumPacketLength != 8 &&
+ if (MaximumPacketLength != 8 &&
MaximumPacketLength != 16 &&
MaximumPacketLength != 32 &&
MaximumPacketLength != 64) {
@@ -1714,7 +1714,7 @@ UHCIControlTransfer ( HcDev->PciIo->Unmap (HcDev->PciIo, Mapping);
return Status;
}
-
+
//
// map the Request for bus master access.
// BusMasterRead means cpu write
@@ -1756,7 +1756,7 @@ UHCIControlTransfer ( HcDev->PciIo->Unmap (HcDev->PciIo, RequestMapping);
return Status;
}
-
+
//
// Data Stage of Control Transfer
//
@@ -1766,7 +1766,7 @@ UHCIControlTransfer ( //
// create TD structures and link together
//
-
+
//
// PktSize is the data load size that each TD carries.
//
@@ -1798,7 +1798,7 @@ UHCIControlTransfer ( DeleteQueuedTDs (HcDev, PtrFirstDataTD);
return Status;
}
-
+
//
// Link two TDs in vertical depth
//
@@ -1827,7 +1827,7 @@ UHCIControlTransfer ( } else {
PktID = OUTPUT_PACKET_ID;
}
-
+
//
// create Status Stage TD structure
//
@@ -2101,54 +2101,54 @@ UHCIBulkTransfer ( OUT UINT32 *TransferResult
)
/*++
-
+
Routine Description:
Submits bulk transfer to a bulk endpoint of a USB device.
-
+
Arguments:
-
+
This A pointer to the EFI_USB_HC_PROTOCOL instance.
-
+
DeviceAddress Represents the address of the target device on the USB,
which is assigned during USB enumeration.
- EndPointAddress The combination of an endpoint number and an
- endpoint direction of the target USB device.
- Each endpoint address supports data transfer in
- one direction except the control endpoint
- (whose default endpoint address is 0).
- It is the caller's responsibility to make sure that
- the EndPointAddress represents a bulk endpoint.
-
+ EndPointAddress The combination of an endpoint number and an
+ endpoint direction of the target USB device.
+ Each endpoint address supports data transfer in
+ one direction except the control endpoint
+ (whose default endpoint address is 0).
+ It is the caller's responsibility to make sure that
+ the EndPointAddress represents a bulk endpoint.
+
MaximumPacketLength Indicates the maximum packet size the target endpoint
is capable of sending or receiving.
-
- Data A pointer to the buffer of data that will be transmitted
+
+ Data A pointer to the buffer of data that will be transmitted
to USB device or received from USB device.
DataLength When input, indicates the size, in bytes, of the data buffer
- specified by Data. When output, indicates the actually
+ specified by Data. When output, indicates the actually
transferred data size.
-
- DataToggle A pointer to the data toggle value. On input, it indicates
+
+ DataToggle A pointer to the data toggle value. On input, it indicates
the initial data toggle value the bulk transfer should adopt;
- on output, it is updated to indicate the data toggle value
- of the subsequent bulk transfer.
-
- TimeOut Indicates the maximum time, in microseconds, which the
+ on output, it is updated to indicate the data toggle value
+ of the subsequent bulk transfer.
+
+ TimeOut Indicates the maximum time, in microseconds, which the
transfer is allowed to complete.
-
- TransferResult A pointer to the detailed result information of the
+
+ TransferResult A pointer to the detailed result information of the
bulk transfer.
Returns:
- EFI_SUCCESS
+ EFI_SUCCESS
The bulk transfer was completed successfully.
- EFI_OUT_OF_RESOURCES
+ EFI_OUT_OF_RESOURCES
The bulk transfer could not be submitted due to lack of resource.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
Some parameters are invalid.
- EFI_TIMEOUT
+ EFI_TIMEOUT
The bulk transfer failed due to timeout.
- EFI_DEVICE_ERROR
+ EFI_DEVICE_ERROR
The bulk transfer failed due to host controller or device error.
Caller should check TranferResult for detailed error information.
@@ -2199,13 +2199,13 @@ UHCIBulkTransfer ( //
// Parameters Checking
//
-
+
if ((DataLength == NULL) ||
(Data == NULL) ||
(TransferResult == NULL)) {
return EFI_INVALID_PARAMETER;
}
-
+
//
// if has errors that cause host controller halt,
// then return EFI_DEVICE_ERROR directly.
@@ -2231,7 +2231,7 @@ UHCIBulkTransfer ( MaximumPacketLength != 64) {
return EFI_INVALID_PARAMETER;
}
-
+
//
// Enable the maximum packet size (64bytes)
// that can be used for full speed bandwidth reclamation
@@ -2243,7 +2243,7 @@ UHCIBulkTransfer ( if (EFI_ERROR (Status)) {
return EFI_DEVICE_ERROR;
}
-
+
//
// construct QH and TD data structures,
// and link them together
@@ -2306,7 +2306,7 @@ UHCIBulkTransfer ( default:
return EFI_INVALID_PARAMETER;
}
-
+
//
// create QH structure and init
//
@@ -2315,7 +2315,7 @@ UHCIBulkTransfer ( HcDev->PciIo->Unmap (HcDev->PciIo, Mapping);
return Status;
}
-
+
//
// i is used to calculate the total number of TDs.
//
@@ -2323,11 +2323,11 @@ UHCIBulkTransfer ( IsFirstTD = TRUE;
while (DataLen > 0) {
-
+
//
// create TD structures and link together
//
-
+
PktSize = (UINT8) DataLen;
if (DataLen > MaximumPacketLength) {
PktSize = MaximumPacketLength;
@@ -2351,7 +2351,7 @@ UHCIBulkTransfer ( DeleteQueuedTDs (HcDev, PtrFirstTD);
return Status;
}
-
+
//
// Enable short packet detection.
// (default action is disabling short packet detection)
@@ -2379,7 +2379,7 @@ UHCIBulkTransfer ( Ptr += PktSize;
DataLen -= PktSize;
}
-
+
//
// link TD structures to QH structure
//
@@ -2416,7 +2416,7 @@ UHCIBulkTransfer ( SavedFrameListIndex = LoadFrameListIndex;
for (Index = 0; Index <= LinkTimes; Index++) {
-
+
//
// put the QH-TD directly or indirectly into the proper place
// in the Frame List
@@ -2473,7 +2473,7 @@ UHCIBulkTransfer ( if (Mapping != NULL) {
HcDev->PciIo->Unmap (HcDev->PciIo, Mapping);
}
-
+
//
// if has errors that cause host controller halt,
// then return EFI_DEVICE_ERROR directly.
@@ -2508,68 +2508,68 @@ UHCIAsyncInterruptTransfer ( IN VOID *Context OPTIONAL
)
/*++
-
+
Routine Description:
- Submits an asynchronous interrupt transfer to an
+ Submits an asynchronous interrupt transfer to an
interrupt endpoint of a USB device.
-
+
Arguments:
-
+
This A pointer to the EFI_USB_HC_PROTOCOL instance.
-
+
DeviceAddress Represents the address of the target device on the USB,
which is assigned during USB enumeration.
-
- EndPointAddress The combination of an endpoint number and an endpoint
- direction of the target USB device. Each endpoint address
- supports data transfer in one direction except the
- control endpoint (whose default endpoint address is 0).
- It is the caller's responsibility to make sure that
+
+ EndPointAddress The combination of an endpoint number and an endpoint
+ direction of the target USB device. Each endpoint address
+ supports data transfer in one direction except the
+ control endpoint (whose default endpoint address is 0).
+ It is the caller's responsibility to make sure that
the EndPointAddress represents an interrupt endpoint.
-
- IsSlowDevice Indicates whether the target device is slow device
+
+ IsSlowDevice Indicates whether the target device is slow device
or full-speed device.
-
+
MaximumPacketLength Indicates the maximum packet size the target endpoint
is capable of sending or receiving.
-
+
IsNewTransfer If TRUE, an asynchronous interrupt pipe is built between
- the host and the target interrupt endpoint.
- If FALSE, the specified asynchronous interrupt pipe
+ the host and the target interrupt endpoint.
+ If FALSE, the specified asynchronous interrupt pipe
is canceled.
-
- DataToggle A pointer to the data toggle value. On input, it is valid
- when IsNewTransfer is TRUE, and it indicates the initial
- data toggle value the asynchronous interrupt transfer
- should adopt.
- On output, it is valid when IsNewTransfer is FALSE,
- and it is updated to indicate the data toggle value of
+
+ DataToggle A pointer to the data toggle value. On input, it is valid
+ when IsNewTransfer is TRUE, and it indicates the initial
+ data toggle value the asynchronous interrupt transfer
+ should adopt.
+ On output, it is valid when IsNewTransfer is FALSE,
+ and it is updated to indicate the data toggle value of
the subsequent asynchronous interrupt transfer.
-
- PollingInterval Indicates the interval, in milliseconds, that the
- asynchronous interrupt transfer is polled.
+
+ PollingInterval Indicates the interval, in milliseconds, that the
+ asynchronous interrupt transfer is polled.
This parameter is required when IsNewTransfer is TRUE.
-
- DataLength Indicates the length of data to be received at the
- rate specified by PollingInterval from the target
- asynchronous interrupt endpoint. This parameter
+
+ DataLength Indicates the length of data to be received at the
+ rate specified by PollingInterval from the target
+ asynchronous interrupt endpoint. This parameter
is only required when IsNewTransfer is TRUE.
-
- CallBackFunction The Callback function.This function is called at the
- rate specified by PollingInterval.This parameter is
+
+ CallBackFunction The Callback function.This function is called at the
+ rate specified by PollingInterval.This parameter is
only required when IsNewTransfer is TRUE.
-
+
Context The context that is passed to the CallBackFunction.
This is an optional parameter and may be NULL.
-
+
Returns:
- EFI_SUCCESS
- The asynchronous interrupt transfer request has been successfully
+ EFI_SUCCESS
+ The asynchronous interrupt transfer request has been successfully
submitted or canceled.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
Some parameters are invalid.
- EFI_OUT_OF_RESOURCES
- The request could not be completed due to a lack of resources.
+ EFI_OUT_OF_RESOURCES
+ The request could not be completed due to a lack of resources.
EFI_DEVICE_ERROR
Can't read register
--*/
@@ -2618,13 +2618,13 @@ UHCIAsyncInterruptTransfer ( if ((EndPointAddress & 0x80) == 0) {
return EFI_INVALID_PARAMETER;
}
-
+
//
// delete Async interrupt transfer request
//
if (!IsNewTransfer) {
- OldTpl = gBS->RaiseTPL (EFI_TPL_NOTIFY);
+ OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
Status = DeleteAsyncINTQHTDs (
HcDev,
@@ -2698,7 +2698,7 @@ UHCIAsyncInterruptTransfer ( //
// create TD structures and link together
//
-
+
PktSize = (UINT8) DataLen;
if (DataLen > MaximumPacketLength) {
PktSize = MaximumPacketLength;
@@ -2745,7 +2745,7 @@ UHCIAsyncInterruptTransfer ( MappedPtr += PktSize;
DataLen -= PktSize;
}
-
+
//
// roll one value back
//
@@ -2774,7 +2774,7 @@ UHCIAsyncInterruptTransfer ( return Status;
}
-
+
//
// link TD structures to QH structure
//
@@ -2827,7 +2827,7 @@ UHCIAsyncInterruptTransfer ( PtrQH = ptrFirstQH;
for (Index = LoadFrameListIndex; Index < (1024 + LoadFrameListIndex);) {
-
+
//
// put the QH-TD directly or indirectly into the proper place
// in the Frame List
@@ -2859,64 +2859,64 @@ UHCISyncInterruptTransfer ( OUT UINT32 *TransferResult
)
/*++
-
+
Routine Description:
- Submits synchronous interrupt transfer to an interrupt endpoint
+ Submits synchronous interrupt transfer to an interrupt endpoint
of a USB device.
-
+
Arguments:
-
+
This A pointer to the EFI_USB_HC_PROTOCOL instance.
-
- DeviceAddress Represents the address of the target device on the USB,
+
+ DeviceAddress Represents the address of the target device on the USB,
which is assigned during USB enumeration.
-
- EndPointAddress The combination of an endpoint number and an endpoint
- direction of the target USB device. Each endpoint
- address supports data transfer in one direction
- except the control endpoint (whose default
+
+ EndPointAddress The combination of an endpoint number and an endpoint
+ direction of the target USB device. Each endpoint
+ address supports data transfer in one direction
+ except the control endpoint (whose default
endpoint address is 0). It is the caller's responsibility
- to make sure that the EndPointAddress represents
- an interrupt endpoint.
-
- IsSlowDevice Indicates whether the target device is slow device
+ to make sure that the EndPointAddress represents
+ an interrupt endpoint.
+
+ IsSlowDevice Indicates whether the target device is slow device
or full-speed device.
-
- MaximumPacketLength Indicates the maximum packet size the target endpoint
+
+ MaximumPacketLength Indicates the maximum packet size the target endpoint
is capable of sending or receiving.
-
- Data A pointer to the buffer of data that will be transmitted
+
+ Data A pointer to the buffer of data that will be transmitted
to USB device or received from USB device.
-
- DataLength On input, the size, in bytes, of the data buffer specified
+
+ DataLength On input, the size, in bytes, of the data buffer specified
by Data. On output, the number of bytes transferred.
-
+
DataToggle A pointer to the data toggle value. On input, it indicates
- the initial data toggle value the synchronous interrupt
- transfer should adopt;
- on output, it is updated to indicate the data toggle value
- of the subsequent synchronous interrupt transfer.
-
- TimeOut Indicates the maximum time, in microseconds, which the
+ the initial data toggle value the synchronous interrupt
+ transfer should adopt;
+ on output, it is updated to indicate the data toggle value
+ of the subsequent synchronous interrupt transfer.
+
+ TimeOut Indicates the maximum time, in microseconds, which the
transfer is allowed to complete.
-
- TransferResult A pointer to the detailed result information from
- the synchronous interrupt transfer.
+
+ TransferResult A pointer to the detailed result information from
+ the synchronous interrupt transfer.
Returns:
- EFI_SUCCESS
+ EFI_SUCCESS
The synchronous interrupt transfer was completed successfully.
- EFI_OUT_OF_RESOURCES
- The synchronous interrupt transfer could not be submitted due
+ EFI_OUT_OF_RESOURCES
+ The synchronous interrupt transfer could not be submitted due
to lack of resource.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
Some parameters are invalid.
- EFI_TIMEOUT
+ EFI_TIMEOUT
The synchronous interrupt transfer failed due to timeout.
- EFI_DEVICE_ERROR
- The synchronous interrupt transfer failed due to host controller
- or device error. Caller should check TranferResult for detailed
- error information.
+ EFI_DEVICE_ERROR
+ The synchronous interrupt transfer failed due to host controller
+ or device error. Caller should check TranferResult for detailed
+ error information.
--*/
{
USB_HC_DEV *HcDev;
@@ -2958,13 +2958,13 @@ UHCISyncInterruptTransfer ( //
// Parameters Checking
//
-
+
if ((DataLength == NULL) ||
(Data == NULL) ||
(TransferResult == NULL)) {
return EFI_INVALID_PARAMETER;
}
-
+
//
// if has errors that cause host controller halt,
// then return EFI_DEVICE_ERROR directly.
@@ -3017,7 +3017,7 @@ UHCISyncInterruptTransfer ( if (EFI_ERROR (Status)) {
return Status;
}
-
+
//
// BusMasterWrite means cpu read
//
@@ -3089,7 +3089,7 @@ UHCISyncInterruptTransfer ( Ptr += PktSize;
DataLen -= PktSize;
}
-
+
//
// link TD structures to QH structure
//
@@ -3119,7 +3119,7 @@ UHCISyncInterruptTransfer ( SavedFrameListIndex = LoadFrameListIndex;
for (Index = 0; Index < LinkTimes; Index++) {
-
+
//
// put the QH-TD directly or indirectly into the proper place
// in the Frame List
@@ -3200,27 +3200,27 @@ UHCIIsochronousTransfer ( OUT UINT32 *TransferResult
)
/*++
-
+
Routine Description:
Submits isochronous transfer to a target USB device.
-
+
Arguments:
-
+
This - A pointer to the EFI_USB_HC_PROTOCOL instance.
DeviceAddress - Represents the address of the target device on the USB,
which is assigned during USB enumeration.
EndPointAddress - End point address
- MaximumPacketLength - Indicates the maximum packet size that the
- default control transfer endpoint is capable of
+ MaximumPacketLength - Indicates the maximum packet size that the
+ default control transfer endpoint is capable of
sending or receiving.
- Data - A pointer to the buffer of data that will be transmitted
+ Data - A pointer to the buffer of data that will be transmitted
to USB device or received from USB device.
- DataLength - Indicates the size, in bytes, of the data buffer
+ DataLength - Indicates the size, in bytes, of the data buffer
specified by Data.
- TransferResult - A pointer to the detailed result information generated
- by this control transfer.
+ TransferResult - A pointer to the detailed result information generated
+ by this control transfer.
Returns:
- EFI_UNSUPPORTED
+ EFI_UNSUPPORTED
--*/
{
@@ -3241,32 +3241,32 @@ UHCIAsyncIsochronousTransfer ( IN VOID *Context OPTIONAL
)
/*++
-
+
Routine Description:
Submits Async isochronous transfer to a target USB device.
-
+
Arguments:
-
+
This - A pointer to the EFI_USB_HC_PROTOCOL instance.
-
+
DeviceAddress - Represents the address of the target device on the USB,
which is assigned during USB enumeration.
EndPointAddress - End point address
-
- MaximumPacketLength - Indicates the maximum packet size that the
- default control transfer endpoint is capable of
+
+ MaximumPacketLength - Indicates the maximum packet size that the
+ default control transfer endpoint is capable of
sending or receiving.
-
- Data - A pointer to the buffer of data that will be transmitted
+
+ Data - A pointer to the buffer of data that will be transmitted
to USB device or received from USB device.
-
+
IsochronousCallBack - When the transfer complete, the call back function will be called
-
+
Context - Pass to the call back function as parameter
-
+
Returns:
- EFI_UNSUPPORTED
+ EFI_UNSUPPORTED
--*/
{
@@ -3291,34 +3291,34 @@ UHCI2GetCapability( Arguments:
This - A pointer to the EFI_USB2_HC_PROTOCOL instance.
-
+
MaxSpeed - A pointer to the max speed USB host controller supports.
-
+
PortNumber - A pointer to the number of root hub ports.
-
+
Is64BitCapable - A pointer to an integer to show whether USB host controller
supports 64-bit memory addressing.
Returns:
- EFI_SUCCESS
+ EFI_SUCCESS
The host controller capabilities were retrieved successfully.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
MaxSpeed or PortNumber or Is64BitCapable is NULL.
- EFI_DEVICE_ERROR
+ EFI_DEVICE_ERROR
An error was encountered while attempting to retrieve the capabilities.
-
---*/
+
+--*/
{
USB_HC_DEV *HcDev;
HcDev = USB2_HC_DEV_FROM_THIS (This);
-
- if ((NULL == MaxSpeed)
+
+ if ((NULL == MaxSpeed)
||(NULL == PortNumber)
|| (NULL == Is64BitCapable))
{
return EFI_INVALID_PARAMETER;
}
-
+
*MaxSpeed = EFI_USB_SPEED_FULL;
*Is64BitCapable = (UINT8)FALSE;
return UHCIGetRootHubPortNumber(&HcDev->UsbHc, PortNumber);
@@ -3337,46 +3337,46 @@ UHCI2Reset ( Arguments:
This - A pointer to the EFI_USB2_HC_PROTOCOL instance.
-
- Attributes - A bit mask of the reset operation to perform.
+
+ Attributes - A bit mask of the reset operation to perform.
See below for a list of the supported bit mask values.
-
+
#define EFI_USB_HC_RESET_GLOBAL 0x0001
#define EFI_USB_HC_RESET_HOST_CONTROLLER 0x0002
#define EFI_USB_HC_RESET_GLOBAL _WITH_DEBUG 0x0004
#define EFI_USB_HC_RESET_HOST_WITH_DEBUG 0x0008
- EFI_USB_HC_RESET_GLOBAL
+ EFI_USB_HC_RESET_GLOBAL
If this bit is set, a global reset signal will be sent to the USB bus.
- This resets all of the USB bus logic, including the USB host
+ This resets all of the USB bus logic, including the USB host
controller hardware and all the devices attached on the USB bus.
- EFI_USB_HC_RESET_HOST_CONTROLLER
- If this bit is set, the USB host controller hardware will be reset.
+ EFI_USB_HC_RESET_HOST_CONTROLLER
+ If this bit is set, the USB host controller hardware will be reset.
No reset signal will be sent to the USB bus.
-
+
Returns:
- EFI_SUCCESS
+ EFI_SUCCESS
The reset operation succeeded.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
Attributes is not valid.
EFI_UNSUPPORTED
The type of reset specified by Attributes is not currently supported by the host controller hardware.
EFI_ACCESS_DENIED
Reset operation is rejected due to the debug port being configured and active.
- EFI_DEVICE_ERROR
- An error was encountered while attempting to perform
+ EFI_DEVICE_ERROR
+ An error was encountered while attempting to perform
the reset operation.
--*/
{
USB_HC_DEV *HcDev;
HcDev = USB2_HC_DEV_FROM_THIS (This);
-
+
if (Attributes==EFI_USB_HC_RESET_GLOBAL_WITH_DEBUG || Attributes==EFI_USB_HC_RESET_HOST_WITH_DEBUG)
return EFI_UNSUPPORTED;
-
+
return UHCIReset(
- &HcDev->UsbHc,
+ &HcDev->UsbHc,
Attributes
);
}
@@ -3388,40 +3388,40 @@ UHCI2GetState ( OUT EFI_USB_HC_STATE * State
)
/*++
-
+
Routine Description:
Retrieves current state of the USB host controller according to UEFI 2.0 spec.
-
+
Arguments:
-
+
This - A pointer to the EFI_USB_HC_PROTOCOL instance.
-
- State - A pointer to the EFI_USB_HC_STATE data structure that
- indicates current state of the USB host controller.
+
+ State - A pointer to the EFI_USB_HC_STATE data structure that
+ indicates current state of the USB host controller.
Type EFI_USB_HC_STATE is defined below.
-
+
typedef enum {
EfiUsbHcStateHalt,
EfiUsbHcStateOperational,
EfiUsbHcStateSuspend,
EfiUsbHcStateMaximum
} EFI_USB_HC_STATE;
-
+
Returns:
- EFI_SUCCESS
+ EFI_SUCCESS
The state information of the host controller was returned in State.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
State is NULL.
- EFI_DEVICE_ERROR
- An error was encountered while attempting to retrieve the
- host controller's current state.
---*/
+ EFI_DEVICE_ERROR
+ An error was encountered while attempting to retrieve the
+ host controller's current state.
+--*/
{
USB_HC_DEV *HcDev;
HcDev = USB2_HC_DEV_FROM_THIS (This);
return UHCIGetState(
- &HcDev->UsbHc,
+ &HcDev->UsbHc,
State
);
}
@@ -3433,31 +3433,31 @@ UHCI2SetState ( IN EFI_USB_HC_STATE State
)
/*++
-
+
Routine Description:
Sets the USB host controller to a specific state according to UEFI 2.0 spec.
-
+
Arguments:
-
+
This - A pointer to the EFI_USB_HC_PROTOCOL instance.
State - Indicates the state of the host controller that will be set.
-
+
Returns:
- EFI_SUCCESS
- The USB host controller was successfully placed in the state
+ EFI_SUCCESS
+ The USB host controller was successfully placed in the state
specified by State.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
State is invalid.
- EFI_DEVICE_ERROR
- Failed to set the state specified by State due to device error.
+ EFI_DEVICE_ERROR
+ Failed to set the state specified by State due to device error.
--*/
{
USB_HC_DEV *HcDev;
HcDev = USB2_HC_DEV_FROM_THIS (This);
return UHCISetState(
- &HcDev->UsbHc,
+ &HcDev->UsbHc,
State
);
}
@@ -3478,53 +3478,53 @@ UHCI2ControlTransfer ( OUT UINT32 *TransferResult
)
/*++
-
+
Routine Description:
Submits control transfer to a target USB device accroding to UEFI 2.0 spec..
-
+
Arguments:
-
+
This - A pointer to the EFI_USB_HC_PROTOCOL instance.
DeviceAddress -Represents the address of the target device on the USB,
which is assigned during USB enumeration.
DeviceSpeed - Indicates transfer speed of device.
-
- MaximumPacketLength - Indicates the maximum packet size that the
- default control transfer endpoint is capable of
+
+ MaximumPacketLength - Indicates the maximum packet size that the
+ default control transfer endpoint is capable of
sending or receiving.
-
- Request - A pointer to the USB device request that will be sent
- to the USB device.
-
+
+ Request - A pointer to the USB device request that will be sent
+ to the USB device.
+
TransferDirection - Specifies the data direction for the transfer.
- There are three values available, DataIn, DataOut
+ There are three values available, DataIn, DataOut
and NoData.
-
- Data -A pointer to the buffer of data that will be transmitted
+
+ Data -A pointer to the buffer of data that will be transmitted
to USB device or received from USB device.
-
- DataLength - Indicates the size, in bytes, of the data buffer
+
+ DataLength - Indicates the size, in bytes, of the data buffer
specified by Data.
-
- TimeOut - Indicates the maximum time, in microseconds,
+
+ TimeOut - Indicates the maximum time, in microseconds,
which the transfer is allowed to complete.
-
- TransferResult - A pointer to the detailed result information generated
+
+ TransferResult - A pointer to the detailed result information generated
by this control transfer.
-
+
Returns:
- EFI_SUCCESS
+ EFI_SUCCESS
The control transfer was completed successfully.
- EFI_OUT_OF_RESOURCES
+ EFI_OUT_OF_RESOURCES
The control transfer could not be completed due to a lack of resources.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
Some parameters are invalid.
- EFI_TIMEOUT
+ EFI_TIMEOUT
The control transfer failed due to timeout.
- EFI_DEVICE_ERROR
- The control transfer failed due to host controller or device error.
+ EFI_DEVICE_ERROR
+ The control transfer failed due to host controller or device error.
Caller should check TranferResult for detailed error information.
--*/
@@ -3533,19 +3533,19 @@ UHCI2ControlTransfer ( BOOLEAN IsSlowDevice = (BOOLEAN) ((EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE);
HcDev = USB2_HC_DEV_FROM_THIS (This);
-
+
return UHCIControlTransfer(
- &HcDev->UsbHc,
- DeviceAddress,
- IsSlowDevice,
- (UINT8) MaximumPacketLength,
- Request,
- TransferDirection,
- Data,
+ &HcDev->UsbHc,
+ DeviceAddress,
+ IsSlowDevice,
+ (UINT8) MaximumPacketLength,
+ Request,
+ TransferDirection,
+ Data,
DataLength,
TimeOut,
TransferResult
- );
+ );
}
EFI_STATUS
@@ -3563,91 +3563,91 @@ UHCI2BulkTransfer ( IN UINTN TimeOut,
IN EFI_USB2_HC_TRANSACTION_TRANSLATOR *Translator,
OUT UINT32 *TransferResult
- )
+ )
/*++
-
+
Routine Description:
Submits bulk transfer to a bulk endpoint of a USB device according to UEFI 2.0 spec.
-
+
Arguments:
-
+
This A pointer to the EFI_USB2_HC_PROTOCOL instance.
-
+
DeviceAddress Represents the address of the target device on the USB,
which is assigned during USB enumeration.
-
- EndPointAddress The combination of an endpoint number and an
- endpoint direction of the target USB device.
- Each endpoint address supports data transfer in
- one direction except the control endpoint
- (whose default endpoint address is 0).
- It is the caller's responsibility to make sure that
- the EndPointAddress represents a bulk endpoint.
-
+
+ EndPointAddress The combination of an endpoint number and an
+ endpoint direction of the target USB device.
+ Each endpoint address supports data transfer in
+ one direction except the control endpoint
+ (whose default endpoint address is 0).
+ It is the caller's responsibility to make sure that
+ the EndPointAddress represents a bulk endpoint.
+
DeviceSpeed Indicates device speed. The supported values are EFI_USB_SPEED_FULL
and EFI_USB_SPEED_HIGH.
-
+
MaximumPacketLength Indicates the maximum packet size the target endpoint
is capable of sending or receiving.
-
+
DataBuffersNumber Number of data buffers prepared for the transfer.
-
- Data Array of pointers to the buffers of data that will be transmitted
+
+ Data Array of pointers to the buffers of data that will be transmitted
to USB device or received from USB device.
-
+
DataLength When input, indicates the size, in bytes, of the data buffer
- specified by Data. When output, indicates the actually
+ specified by Data. When output, indicates the actually
transferred data size.
-
- DataToggle A pointer to the data toggle value. On input, it indicates
+
+ DataToggle A pointer to the data toggle value. On input, it indicates
the initial data toggle value the bulk transfer should adopt;
- on output, it is updated to indicate the data toggle value
- of the subsequent bulk transfer.
-
+ on output, it is updated to indicate the data toggle value
+ of the subsequent bulk transfer.
+
Translator A pointr to the transaction translator data.
-
- TimeOut Indicates the maximum time, in microseconds, which the
+
+ TimeOut Indicates the maximum time, in microseconds, which the
transfer is allowed to complete.
-
- TransferResult A pointer to the detailed result information of the
+
+ TransferResult A pointer to the detailed result information of the
bulk transfer.
Returns:
- EFI_SUCCESS
+ EFI_SUCCESS
The bulk transfer was completed successfully.
-
- EFI_OUT_OF_RESOURCES
+
+ EFI_OUT_OF_RESOURCES
The bulk transfer could not be submitted due to lack of resource.
-
- EFI_INVALID_PARAMETER
+
+ EFI_INVALID_PARAMETER
Some parameters are invalid.
-
- EFI_TIMEOUT
+
+ EFI_TIMEOUT
The bulk transfer failed due to timeout.
-
- EFI_DEVICE_ERROR
+
+ EFI_DEVICE_ERROR
The bulk transfer failed due to host controller or device error.
Caller should check TranferResult for detailed error information.
---*/
+--*/
{
USB_HC_DEV *HcDev;
HcDev = USB2_HC_DEV_FROM_THIS (This);
-
+
if( Data == NULL || DeviceSpeed==EFI_USB_SPEED_LOW)
return EFI_INVALID_PARAMETER;
/* For full-speed bulk transfers only the data pointed by Data[0] shall be used */
return UHCIBulkTransfer (
- &HcDev->UsbHc,
- DeviceAddress,
- EndPointAddress,
- (UINT8) MaximumPacketLength,
- *Data,
- DataLength,
- DataToggle,
- TimeOut,
+ &HcDev->UsbHc,
+ DeviceAddress,
+ EndPointAddress,
+ (UINT8) MaximumPacketLength,
+ *Data,
+ DataLength,
+ DataToggle,
+ TimeOut,
TransferResult
);
}
@@ -3669,91 +3669,91 @@ UHCI2AsyncInterruptTransfer ( IN VOID *Context
)
/*++
-
+
Routine Description:
- Submits an asynchronous interrupt transfer to an
+ Submits an asynchronous interrupt transfer to an
interrupt endpoint of a USB device according to UEFI 2.0 spec.
-
+
Arguments:
-
+
This A pointer to the EFI_USB2_HC_PROTOCOL instance.
-
+
DeviceAddress Represents the address of the target device on the USB,
which is assigned during USB enumeration.
-
- EndPointAddress The combination of an endpoint number and an endpoint
- direction of the target USB device. Each endpoint address
- supports data transfer in one direction except the
- control endpoint (whose default endpoint address is 0).
- It is the caller's responsibility to make sure that
+
+ EndPointAddress The combination of an endpoint number and an endpoint
+ direction of the target USB device. Each endpoint address
+ supports data transfer in one direction except the
+ control endpoint (whose default endpoint address is 0).
+ It is the caller's responsibility to make sure that
the EndPointAddress represents an interrupt endpoint.
-
+
DeviceSpeed Indicates device speed.
-
+
MaximumPacketLength Indicates the maximum packet size the target endpoint
is capable of sending or receiving.
-
+
IsNewTransfer If TRUE, an asynchronous interrupt pipe is built between
- the host and the target interrupt endpoint.
- If FALSE, the specified asynchronous interrupt pipe
+ the host and the target interrupt endpoint.
+ If FALSE, the specified asynchronous interrupt pipe
is canceled.
-
- DataToggle A pointer to the data toggle value. On input, it is valid
- when IsNewTransfer is TRUE, and it indicates the initial
- data toggle value the asynchronous interrupt transfer
- should adopt.
- On output, it is valid when IsNewTransfer is FALSE,
- and it is updated to indicate the data toggle value of
+
+ DataToggle A pointer to the data toggle value. On input, it is valid
+ when IsNewTransfer is TRUE, and it indicates the initial
+ data toggle value the asynchronous interrupt transfer
+ should adopt.
+ On output, it is valid when IsNewTransfer is FALSE,
+ and it is updated to indicate the data toggle value of
the subsequent asynchronous interrupt transfer.
-
- PollingInterval Indicates the interval, in milliseconds, that the
- asynchronous interrupt transfer is polled.
+
+ PollingInterval Indicates the interval, in milliseconds, that the
+ asynchronous interrupt transfer is polled.
This parameter is required when IsNewTransfer is TRUE.
-
- DataLength Indicates the length of data to be received at the
- rate specified by PollingInterval from the target
- asynchronous interrupt endpoint. This parameter
+
+ DataLength Indicates the length of data to be received at the
+ rate specified by PollingInterval from the target
+ asynchronous interrupt endpoint. This parameter
is only required when IsNewTransfer is TRUE.
-
+
Translator A pointr to the transaction translator data.
-
- CallBackFunction The Callback function.This function is called at the
- rate specified by PollingInterval.This parameter is
+
+ CallBackFunction The Callback function.This function is called at the
+ rate specified by PollingInterval.This parameter is
only required when IsNewTransfer is TRUE.
-
+
Context The context that is passed to the CallBackFunction.
This is an optional parameter and may be NULL.
-
+
Returns:
-
- EFI_SUCCESS
- The asynchronous interrupt transfer request has been successfully
+
+ EFI_SUCCESS
+ The asynchronous interrupt transfer request has been successfully
submitted or canceled.
-
- EFI_INVALID_PARAMETER
+
+ EFI_INVALID_PARAMETER
Some parameters are invalid.
-
- EFI_OUT_OF_RESOURCES
- The request could not be completed due to a lack of resources.
-
+
+ EFI_OUT_OF_RESOURCES
+ The request could not be completed due to a lack of resources.
+
EFI_DEVICE_ERROR
Can't read register
---*/
+--*/
{
USB_HC_DEV *HcDev;
BOOLEAN IsSlowDevice = (BOOLEAN) ((EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE);
-
+
HcDev = USB2_HC_DEV_FROM_THIS (This);
return UHCIAsyncInterruptTransfer(
- &HcDev->UsbHc,
- DeviceAddress,
- EndPointAddress,
- IsSlowDevice,
- (UINT8) MaximumPacketLength,
- IsNewTransfer,
- DataToggle,
+ &HcDev->UsbHc,
+ DeviceAddress,
+ EndPointAddress,
+ IsSlowDevice,
+ (UINT8) MaximumPacketLength,
+ IsNewTransfer,
+ DataToggle,
PollingInterval,
- DataLength,
+ DataLength,
CallBackFunction,
Context
);
@@ -3775,82 +3775,82 @@ UHCI2SyncInterruptTransfer ( OUT UINT32 *TransferResult
)
/*++
-
+
Routine Description:
- Submits synchronous interrupt transfer to an interrupt endpoint
+ Submits synchronous interrupt transfer to an interrupt endpoint
of a USB device according to UEFI 2.0 spec.
-
+
Arguments:
-
+
This A pointer to the EFI_USB2_HC_PROTOCOL instance.
-
- DeviceAddress Represents the address of the target device on the USB,
+
+ DeviceAddress Represents the address of the target device on the USB,
which is assigned during USB enumeration.
-
- EndPointAddress The combination of an endpoint number and an endpoint
- direction of the target USB device. Each endpoint
- address supports data transfer in one direction
- except the control endpoint (whose default
+
+ EndPointAddress The combination of an endpoint number and an endpoint
+ direction of the target USB device. Each endpoint
+ address supports data transfer in one direction
+ except the control endpoint (whose default
endpoint address is 0). It is the caller's responsibility
- to make sure that the EndPointAddress represents
- an interrupt endpoint.
-
+ to make sure that the EndPointAddress represents
+ an interrupt endpoint.
+
DeviceSpeed Indicates device speed.
-
- MaximumPacketLength Indicates the maximum packet size the target endpoint
+
+ MaximumPacketLength Indicates the maximum packet size the target endpoint
is capable of sending or receiving.
-
- Data A pointer to the buffer of data that will be transmitted
+
+ Data A pointer to the buffer of data that will be transmitted
to USB device or received from USB device.
-
- DataLength On input, the size, in bytes, of the data buffer specified
+
+ DataLength On input, the size, in bytes, of the data buffer specified
by Data. On output, the number of bytes transferred.
-
+
DataToggle A pointer to the data toggle value. On input, it indicates
- the initial data toggle value the synchronous interrupt
- transfer should adopt;
- on output, it is updated to indicate the data toggle value
- of the subsequent synchronous interrupt transfer.
-
- TimeOut Indicates the maximum time, in microseconds, which the
+ the initial data toggle value the synchronous interrupt
+ transfer should adopt;
+ on output, it is updated to indicate the data toggle value
+ of the subsequent synchronous interrupt transfer.
+
+ TimeOut Indicates the maximum time, in microseconds, which the
transfer is allowed to complete.
Translator A pointr to the transaction translator data.
- TransferResult A pointer to the detailed result information from
- the synchronous interrupt transfer.
+ TransferResult A pointer to the detailed result information from
+ the synchronous interrupt transfer.
Returns:
- EFI_SUCCESS
+ EFI_SUCCESS
The synchronous interrupt transfer was completed successfully.
- EFI_OUT_OF_RESOURCES
- The synchronous interrupt transfer could not be submitted due
+ EFI_OUT_OF_RESOURCES
+ The synchronous interrupt transfer could not be submitted due
to lack of resource.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
Some parameters are invalid.
- EFI_TIMEOUT
+ EFI_TIMEOUT
The synchronous interrupt transfer failed due to timeout.
- EFI_DEVICE_ERROR
- The synchronous interrupt transfer failed due to host controller
- or device error. Caller should check TranferResult for detailed
- error information.
---*/
+ EFI_DEVICE_ERROR
+ The synchronous interrupt transfer failed due to host controller
+ or device error. Caller should check TranferResult for detailed
+ error information.
+--*/
{
USB_HC_DEV *HcDev;
BOOLEAN IsSlowDevice;
-
+
if(DeviceSpeed==EFI_USB_SPEED_HIGH)
return EFI_INVALID_PARAMETER;
-
- IsSlowDevice = (BOOLEAN) ((EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE);
+
+ IsSlowDevice = (BOOLEAN) ((EFI_USB_SPEED_LOW == DeviceSpeed) ? TRUE : FALSE);
HcDev = USB2_HC_DEV_FROM_THIS (This);
-
+
return UHCISyncInterruptTransfer(
- &HcDev->UsbHc,
- DeviceAddress,
- EndPointAddress,
- IsSlowDevice,
- (UINT8) MaximumPacketLength,
- Data,
- DataLength,
+ &HcDev->UsbHc,
+ DeviceAddress,
+ EndPointAddress,
+ IsSlowDevice,
+ (UINT8) MaximumPacketLength,
+ Data,
+ DataLength,
DataToggle,
TimeOut,
TransferResult
@@ -3872,43 +3872,43 @@ UHCI2IsochronousTransfer ( OUT UINT32 *TransferResult
)
/*++
-
+
Routine Description:
-
+
Submits isochronous transfer to a target USB device according to UEFI 2.0 spec.
-
+
Arguments:
-
+
This A pointer to the EFI_USB2_HC_PROTOCOL instance.
-
+
DeviceAddress Represents the address of the target device on the USB,
which is assigned during USB enumeration.
-
+
EndPointAddress End point address
-
+
DeviceSpeed Indicates device speed.
-
- MaximumPacketLength Indicates the maximum packet size that the
- default control transfer endpoint is capable of
+
+ MaximumPacketLength Indicates the maximum packet size that the
+ default control transfer endpoint is capable of
sending or receiving.
-
+
DataBuffersNumber Number of data buffers prepared for the transfer.
-
- Data Array of pointers to the buffers of data that will be
+
+ Data Array of pointers to the buffers of data that will be
transmitted to USB device or received from USB device.
-
- DataLength Indicates the size, in bytes, of the data buffer
+
+ DataLength Indicates the size, in bytes, of the data buffer
specified by Data.
-
+
Translator A pointr to the transaction translator data.
-
- TransferResult A pointer to the detailed result information generated
- by this control transfer.
+
+ TransferResult A pointer to the detailed result information generated
+ by this control transfer.
Returns:
-
- EFI_UNSUPPORTED
---*/
+ EFI_UNSUPPORTED
+
+--*/
{
return EFI_UNSUPPORTED;
}
@@ -3929,42 +3929,42 @@ UHCI2AsyncIsochronousTransfer ( IN VOID *Context
)
/*++
-
+
Routine Description:
-
+
Submits Async isochronous transfer to a target USB device according to UEFI 2.0 spec.
-
+
Arguments:
-
+
This A pointer to the EFI_USB2_HC_PROTOCOL instance.
-
+
DeviceAddress Represents the address of the target device on the USB,
which is assigned during USB enumeration.
EndPointAddress End point address
-
+
DeviceSpeed Indicates device speed.
-
- MaximumPacketLength Indicates the maximum packet size that the
- default control transfer endpoint is capable of
+
+ MaximumPacketLength Indicates the maximum packet size that the
+ default control transfer endpoint is capable of
sending or receiving.
-
+
DataBuffersNumber Number of data buffers prepared for the transfer.
-
- Data Array of pointers to the buffers of data that will be transmitted
+
+ Data Array of pointers to the buffers of data that will be transmitted
to USB device or received from USB device.
-
+
Translator A pointr to the transaction translator data.
-
+
IsochronousCallBack When the transfer complete, the call back function will be called
-
+
Context Pass to the call back function as parameter
-
+
Returns:
-
- EFI_UNSUPPORTED
---*/
+ EFI_UNSUPPORTED
+
+--*/
{
return EFI_UNSUPPORTED;
}
@@ -3977,38 +3977,38 @@ UHCI2GetRootHubPortStatus ( OUT EFI_USB_PORT_STATUS * PortStatus
)
/*++
-
+
Routine Description:
Retrieves the current status of a USB root hub port according to UEFI 2.0 spec.
-
+
Arguments:
-
+
This A pointer to the EFI_USB2_HC_PROTOCOL.
-
- PortNumber Specifies the root hub port from which the status
- is to be retrieved. This value is zero-based. For example,
+
+ PortNumber Specifies the root hub port from which the status
+ is to be retrieved. This value is zero-based. For example,
if a root hub has two ports, then the first port is numbered 0,
and the second port is numbered 1.
-
- PortStatus A pointer to the current port status bits and
- port status change bits.
-
+
+ PortStatus A pointer to the current port status bits and
+ port status change bits.
+
Returns:
- EFI_SUCCESS
- The status of the USB root hub port specified by PortNumber
+ EFI_SUCCESS
+ The status of the USB root hub port specified by PortNumber
was returned in PortStatus.
- EFI_INVALID_PARAMETER
- PortNumber is invalid.
- EFI_DEVICE_ERROR - Can't read register
---*/
+ EFI_INVALID_PARAMETER
+ PortNumber is invalid.
+ EFI_DEVICE_ERROR - Can't read register
+--*/
{
USB_HC_DEV *HcDev;
HcDev = USB2_HC_DEV_FROM_THIS (This);
-
+
return UHCIGetRootHubPortStatus(
- &HcDev->UsbHc,
- PortNumber,
+ &HcDev->UsbHc,
+ PortNumber,
PortStatus
);
}
@@ -4021,36 +4021,36 @@ UHCI2SetRootHubPortFeature ( IN EFI_USB_PORT_FEATURE PortFeature
)
/*++
-
+
Routine Description:
Sets a feature for the specified root hub port according to UEFI 2.0 spec.
-
+
Arguments:
-
+
This A pointer to the EFI_USB2_HC_PROTOCOL.
-
- PortNumber Specifies the root hub port whose feature
+
+ PortNumber Specifies the root hub port whose feature
is requested to be set.
-
- PortFeature Indicates the feature selector associated
- with the feature set request.
-
+
+ PortFeature Indicates the feature selector associated
+ with the feature set request.
+
Returns:
- EFI_SUCCESS
- The feature specified by PortFeature was set for the
+ EFI_SUCCESS
+ The feature specified by PortFeature was set for the
USB root hub port specified by PortNumber.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
PortNumber is invalid or PortFeature is invalid.
EFI_DEVICE_ERROR
Can't read register
---*/
+--*/
{
USB_HC_DEV *HcDev;
HcDev = USB2_HC_DEV_FROM_THIS (This);
return UHCISetRootHubPortFeature(
- &HcDev->UsbHc,
- PortNumber,
+ &HcDev->UsbHc,
+ PortNumber,
PortFeature
);
}
@@ -4063,36 +4063,36 @@ UHCI2ClearRootHubPortFeature ( IN EFI_USB_PORT_FEATURE PortFeature
)
/*++
-
+
Routine Description:
Clears a feature for the specified root hub port according to Uefi 2.0 spec.
-
+
Arguments:
-
+
This A pointer to the EFI_USB2_HC_PROTOCOL instance.
-
- PortNumber Specifies the root hub port whose feature
+
+ PortNumber Specifies the root hub port whose feature
is requested to be cleared.
-
- PortFeature Indicates the feature selector associated with the
+
+ PortFeature Indicates the feature selector associated with the
feature clear request.
-
+
Returns:
- EFI_SUCCESS
- The feature specified by PortFeature was cleared for the
+ EFI_SUCCESS
+ The feature specified by PortFeature was cleared for the
USB root hub port specified by PortNumber.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
PortNumber is invalid or PortFeature is invalid.
EFI_DEVICE_ERROR
Can't read register
---*/
+--*/
{
USB_HC_DEV *HcDev;
HcDev = USB2_HC_DEV_FROM_THIS (This);
return UHCIClearRootHubPortFeature(
- &HcDev->UsbHc,
- PortNumber,
+ &HcDev->UsbHc,
+ PortNumber,
PortFeature
);
}
@@ -4111,7 +4111,7 @@ MonitorInterruptTrans ( Contex - Pointer to USB_HC_DEV
Returns:
None
---*/
+--*/
{
USB_HC_DEV *HcDev;
@@ -4199,7 +4199,7 @@ MonitorInterruptTrans ( if (DataBuffer) {
gBS->FreePool (DataBuffer);
}
-
+
//
// update should done after data buffer got.
//
diff --git a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Init.c b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Init.c index 89d7a1f..a32c62a 100644 --- a/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Init.c +++ b/EdkModulePkg/Bus/Pci/Undi/RuntimeDxe/Init.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:
@@ -30,7 +30,7 @@ PXE_SW_UNDI *pxe = 0; // 3.0 entry point PXE_SW_UNDI *pxe_31 = 0; // 3.1 entry
UNDI32_DEV *UNDI32DeviceList[MAX_NIC_INTERFACES];
-NII_TABLE *UnidiDataPointer=NULL;
+NII_TABLE *UnidiDataPointer=NULL;
VOID
EFIAPI
@@ -103,7 +103,7 @@ UndiNotifyExitBs ( Routine Description:
- When EFI is shuting down the boot services, we need to install a
+ When EFI is shuting down the boot services, we need to install a
configuration table for UNDI to work at runtime!
Arguments:
@@ -161,8 +161,8 @@ Returns: EFI_EVENT Event;
Status = gBS->CreateEvent (
- EFI_EVENT_SIGNAL_EXIT_BOOT_SERVICES,
- EFI_TPL_NOTIFY,
+ EVT_SIGNAL_EXIT_BOOT_SERVICES,
+ TPL_NOTIFY,
UndiNotifyExitBs,
NULL,
&Event
@@ -191,15 +191,15 @@ Routine Description: Arguments:
This - Protocol instance pointer.
-
+
Controller - Handle of device to test.
-
+
RemainingDevicePath - Not used.
Returns:
EFI_SUCCESS - This driver supports this device.
-
+
other - This driver does not support this device.
--*/
@@ -305,15 +305,15 @@ Routine Description: Arguments:
This - Protocol instance pointer.
-
+
Controller - Handle of device to work with.
-
+
RemainingDevicePath - Not used, always produce all possible children.
Returns:
EFI_SUCCESS - This driver is added to Controller.
-
+
other - This driver does not support this device.
--*/
@@ -325,7 +325,7 @@ Returns: UINT16 NewCommand;
UINT8 *TmpPxePointer;
EFI_PCI_IO_PROTOCOL *PciIoFncs;
- UINTN Len;
+ UINTN Len;
Status = gBS->OpenProtocol (
Controller,
@@ -538,7 +538,7 @@ Returns: }
//
- // if the table exists, free it and alloc again, or alloc it directly
+ // if the table exists, free it and alloc again, or alloc it directly
//
if (UnidiDataPointer != NULL) {
Status = gBS->FreePool(UnidiDataPointer);
@@ -553,7 +553,7 @@ Returns: if (EFI_ERROR (Status)) {
goto UndiErrorAllocDataPointer;
}
-
+
//
// Open For Child Device
//
@@ -750,7 +750,7 @@ Routine Description: Arguments:
UnqId - Runtime O/S routine might use this, this temp routine does not use it
-
+
MicroSeconds - Determines the length of pause.
Returns:
@@ -780,13 +780,13 @@ Routine Description: Arguments:
UnqId - Runtime O/S routine may use this field, this temp routine does not.
-
+
ReadWrite - Determine if it is an I/O or Memory Read/Write Operation.
-
+
Len - Determines the width of the data operation.
-
+
Port - What port to Read/Write from.
-
+
BuffAddr - Address to read to or write from.
Returns:
@@ -880,15 +880,15 @@ Routine Description: Arguments:
DevPtr - Pointer which will point to the newly created device path with the MAC node attached.
-
+
BaseDevPtr - Pointer to the device path which the UNDI device driver is latching on to.
-
+
AdapterInfo - Pointer to the NIC data structure information which the UNDI driver is layering on..
Returns:
EFI_SUCCESS - A MAC address was successfully appended to the Base Device Path.
-
+
other - Not enough resources available to create new Device Path node.
--*/
@@ -1020,7 +1020,7 @@ Arguments: Returns:
EFI_SUCCESS - Install a GUID/Pointer pair into the system's configuration table.
-
+
other - Did not successfully install the GUID/Pointer pair into the configuration table.
--*/
@@ -1036,12 +1036,12 @@ Returns: return EFI_SUCCESS;
}
- if(UnidiDataPointer == NULL) {
+ if(UnidiDataPointer == NULL) {
return EFI_SUCCESS;
}
-
- UndiData = (NII_TABLE *)UnidiDataPointer;
-
+
+ UndiData = (NII_TABLE *)UnidiDataPointer;
+
UndiData->NumEntries = pxe_31->IFcnt;
UndiData->NextLink = NULL;
diff --git a/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.c b/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.c index 9eac2c4..9b3c01f 100644 --- a/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.c +++ b/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.c @@ -334,7 +334,7 @@ Returns: EFI_STATUS Status;
EFI_TPL OldTpl;
- OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);
+ OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
ScsiDiskDevice = SCSI_DISK_DEV_FROM_THIS (This);
@@ -405,7 +405,7 @@ Returns: return EFI_SUCCESS;
}
- OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);
+ OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
ScsiDiskDevice = SCSI_DISK_DEV_FROM_THIS (This);
@@ -529,7 +529,7 @@ Returns: return EFI_SUCCESS;
}
- OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);
+ OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
ScsiDiskDevice = SCSI_DISK_DEV_FROM_THIS (This);
diff --git a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.c b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.c index e1fdce7..97c9f5e 100644 --- a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.c +++ b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/usbbus.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:
@@ -201,7 +201,7 @@ UsbFreeAddress ( Arguments:
DevAddress - Usb device address
AddressPool - Pool of usb device address
-
+
Returns:
VOID
@@ -259,7 +259,7 @@ UsbBusControllerDriverSupported ( return EFI_UNSUPPORTED;
}
}
-
+
//
// Open the IO Abstraction(s) needed to perform the supported test
//
@@ -285,7 +285,7 @@ UsbBusControllerDriverSupported ( This->DriverBindingHandle,
Controller
);
-
+
//
// Check whether USB Host Controller Protocol is already
// installed on this handle. If it is installed, we can start
@@ -302,7 +302,7 @@ UsbBusControllerDriverSupported ( if (Status == EFI_ALREADY_STARTED) {
return EFI_SUCCESS;
}
-
+
if (EFI_ERROR (Status)) {
Status = gBS->OpenProtocol (
Controller,
@@ -328,7 +328,7 @@ UsbBusControllerDriverSupported ( );
return EFI_SUCCESS;
}
-
+
gBS->CloseProtocol (
Controller,
&gEfiUsb2HcProtocolGuid,
@@ -622,8 +622,8 @@ UsbBusControllerDriverStart ( // Create a timer to query root ports periodically
//
Status = gBS->CreateEvent (
- EFI_EVENT_TIMER | EFI_EVENT_NOTIFY_SIGNAL,
- EFI_TPL_CALLBACK,
+ EVT_TIMER | EVT_NOTIFY_SIGNAL,
+ TPL_CALLBACK,
RootHubEnumeration,
RootHubController,
&RootHubController->HubNotify
@@ -670,7 +670,7 @@ UsbBusControllerDriverStart ( // there will be an interval between bus start and devices start.
//
gBS->SignalEvent (RootHubController->HubNotify);
-
+
Status = gBS->SetTimer (
RootHubController->HubNotify,
TimerPeriodic,
@@ -1229,7 +1229,7 @@ UsbDeviceDeConfiguration ( Arguments:
UsbIoDevice - The device to be deconfigured.
- Returns:
+ Returns:
EFI_SUCCESS
EFI_DEVICE_ERROR
@@ -1307,7 +1307,7 @@ UsbDeviceDeConfiguration ( NULL
);
}
-
+
//
// remove child handle reference to the USB_HC_PROTOCOL
//
@@ -1422,7 +1422,7 @@ OnHubInterruptComplete ( &UsbResult
);
}
-
+
//
// Delete & Submit this interrupt again
//
@@ -1467,7 +1467,7 @@ OnHubInterruptComplete ( if (DataLength == 0 || Data == NULL) {
return EFI_SUCCESS;
}
-
+
//
// Scan which port has status change
// Bit 0 stands for hub itself, other bit stands for
@@ -1500,18 +1500,18 @@ RootHubEnumeration ( /*++
Routine Description:
-
+
This is USB RootHub enumerator
Arguments:
-
+
Event - Indicating which event is signaled
Context - actually it is a USB_IO_DEVICE
Returns:
-
+
VOID
-
+
--*/
{
USB_IO_CONTROLLER_DEVICE *HubController;
@@ -1565,7 +1565,7 @@ RootHubEnumeration ( );
if (IsPortConnect (HubPortStatus.PortStatus)) {
-
+
//
// There is something connected to this port
//
@@ -1602,8 +1602,8 @@ RootHubEnumeration ( // Process of identify device speed
//
Status = IdentifyDeviceSpeed (
- UsbBusDev,
- NewDevice,
+ UsbBusDev,
+ NewDevice,
Index
);
if (EFI_ERROR (Status)) {
@@ -1667,8 +1667,8 @@ RootHubEnumeration ( // Create an event to do hub enumeration
//
gBS->CreateEvent (
- EFI_EVENT_NOTIFY_SIGNAL,
- EFI_TPL_CALLBACK,
+ EVT_NOTIFY_SIGNAL,
+ TPL_CALLBACK,
HubEnumeration,
NewController,
&NewController->HubNotify
@@ -1727,11 +1727,11 @@ HubEnumeration ( /*++
Routine Description:
-
+
This is Usb Hub enumerator
Arguments:
-
+
Event - Indicating which event is signaled
Context - actually it is a USB_IO_DEVICE
@@ -2040,8 +2040,8 @@ HubEnumeration ( // Create an event to do hub enumeration
//
gBS->CreateEvent (
- EFI_EVENT_NOTIFY_SIGNAL,
- EFI_TPL_CALLBACK,
+ EVT_NOTIFY_SIGNAL,
+ TPL_CALLBACK,
HubEnumeration,
NewController,
&NewController->HubNotify
@@ -2213,7 +2213,7 @@ ParentPortReset ( UsbIoController - Indicating the Usb Controller Device.
ReConfigure - Do we need to reconfigure it.
RetryTimes - Retry Times when failed
-
+
Returns:
EFI_SUCCESS
EFI_DEVICE_ERROR
@@ -2305,7 +2305,7 @@ UsbPortReset ( if (IsHub (UsbIoController)) {
return EFI_INVALID_PARAMETER;
}
-
+
//
// Since at this time, this device has already been configured,
// it needs to be re-configured.
@@ -2329,7 +2329,7 @@ ResetRootPort ( UsbBusDev - Bus controller of the device.
PortNum - The given port to be reset.
RetryTimes - RetryTimes when failed
-
+
Returns:
EFI_SUCCESS
EFI_DEVICE_ERROR
@@ -2594,22 +2594,22 @@ UsbSetTransactionTranslator ( IN OUT USB_IO_DEVICE *Device
)
/*++
-
+
Routine Description:
-
+
Set Transaction Translator parameter
-
+
Arguments:
-
+
ParentHubController - Controller structure of the parent Hub device
ParentPort - Number of parent port
Device - Structure of the device
-
+
Returns:
-
+
EFI_SUCCESS Success
EFI_OUT_OF_RESOURCES Cannot allocate resources
-
+
--*/
{
USB_IO_CONTROLLER_DEVICE *AncestorHubController;
@@ -2650,19 +2650,19 @@ UsbUnsetTransactionTranslator ( USB_IO_DEVICE *Device
)
/*++
-
+
Routine Description:
-
+
Unset Transaction Translator parameter
-
+
Arguments:
-
+
Device - Structure of the device
-
+
Returns:
-
+
EFI_SUCCESS Success
-
+
--*/
{
if (Device->Translator) {
@@ -2681,22 +2681,22 @@ IdentifyDeviceSpeed ( UINT8 Index
)
/*++
-
+
Routine Description:
-
+
Identify speed of USB device
-
+
Arguments:
-
+
UsbBusDev - UsbBus controller structure of the device
NewDevice - Devcie controller structure
Index - Number of the port
-
+
Returns:
-
+
EFI_SUCCESS Success
EFI_NOT_FOUND Device release to CHC or can't be found
-
+
--*/
{
EFI_STATUS Status;
@@ -2707,7 +2707,7 @@ IdentifyDeviceSpeed ( Index,
(EFI_USB_PORT_STATUS *) &HubPortStatus
);
-
+
//
// Check device device
//
@@ -2717,7 +2717,7 @@ IdentifyDeviceSpeed ( //
if (HubPortStatus.PortStatus & USB_PORT_STAT_HIGH_SPEED) {
DEBUG ((gUSBDebugLevel, "High Speed Device attached to EHC\n"));
- NewDevice->DeviceSpeed = EFI_USB_SPEED_HIGH;
+ NewDevice->DeviceSpeed = EFI_USB_SPEED_HIGH;
} else {
Status = ReleasePortToCHC (UsbBusDev, Index);
if (EFI_ERROR (Status)) {
@@ -2733,13 +2733,13 @@ IdentifyDeviceSpeed ( //
if (HubPortStatus.PortStatus & USB_PORT_STAT_LOW_SPEED) {
DEBUG ((gUSBDebugLevel, "Low Speed Device attached to CHC\n"));
- NewDevice->DeviceSpeed = EFI_USB_SPEED_LOW;
+ NewDevice->DeviceSpeed = EFI_USB_SPEED_LOW;
} else {
DEBUG ((gUSBDebugLevel, "FULL Speed Device attached to CHC\n"));
- NewDevice->DeviceSpeed = EFI_USB_SPEED_FULL;
+ NewDevice->DeviceSpeed = EFI_USB_SPEED_FULL;
}
}
-
+
return EFI_SUCCESS;
}
@@ -2750,21 +2750,21 @@ ReleasePortToCHC ( UINT8 PortNum
)
/*++
-
+
Routine Description:
-
+
Set bit to release the port owner to CHC
-
+
Arguments:
-
+
UsbBusDev - UsbBus controller structure of the device
PortNum - Number of the port
-
+
Returns:
-
+
EFI_SUCCESS Success
EFI_DEVICE_ERROR Fail
-
+
--*/
{
EFI_STATUS Status;
@@ -2789,29 +2789,29 @@ UsbVirtualHcGetCapability ( OUT UINT8 *Is64BitCapable
)
/*++
-
+
Routine Description:
-
- Virtual interface to Retrieves the capablility of root hub ports
+
+ Virtual interface to Retrieves the capablility of root hub ports
for both Hc2 and Hc protocol.
-
+
Arguments:
-
+
UsbBusDev - A pointer to bus controller of the device.
MaxSpeed - A pointer to the number of the host controller.
PortNumber - A pointer to the number of the root hub ports.
- Is64BitCapable - A pointer to the flag for whether controller supports
+ Is64BitCapable - A pointer to the flag for whether controller supports
64-bit memory addressing.
-
+
Returns:
-
- EFI_SUCCESS
+
+ EFI_SUCCESS
The host controller capability were retrieved successfully.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
MaxSpeed or PortNumber or Is64BitCapable is NULL.
- EFI_DEVICE_ERROR
- An error was encountered while attempting to retrieve the capabilities.
-
+ EFI_DEVICE_ERROR
+ An error was encountered while attempting to retrieve the capabilities.
+
--*/
{
EFI_STATUS Status;
@@ -2844,59 +2844,59 @@ UsbVirtualHcReset ( IN UINT16 Attributes
)
/*++
-
+
Routine Description:
-
+
Virtual interface to provides software reset for the USB host controller
for both Hc2 and Hc protocol.
-
+
Arguments:
-
+
UsbBusDev - A pointer to bus controller of the device.
- Attributes - A bit mask of the reset operation to perform.
+ Attributes - A bit mask of the reset operation to perform.
See below for a list of the supported bit mask values.
-
+
#define EFI_USB_HC_RESET_GLOBAL 0x0001 // Hc2 and Hc
#define EFI_USB_HC_RESET_HOST_CONTROLLER 0x0002 // Hc2 and Hc
#define EFI_USB_HC_RESET_GLOBAL_WITH_DEBUG 0x0004 // Hc2
#define EFI_USB_HC_RESET_HOST_WITH_DEBUG 0x0008 // Hc2
- EFI_USB_HC_RESET_GLOBAL
+ EFI_USB_HC_RESET_GLOBAL
If this bit is set, a global reset signal will be sent to the USB bus.
- This resets all of the USB bus logic, including the USB host
+ This resets all of the USB bus logic, including the USB host
controller hardware and all the devices attached on the USB bus.
- EFI_USB_HC_RESET_HOST_CONTROLLER
- If this bit is set, the USB host controller hardware will be reset.
+ EFI_USB_HC_RESET_HOST_CONTROLLER
+ If this bit is set, the USB host controller hardware will be reset.
No reset signal will be sent to the USB bus.
EFI_USB_HC_RESET_GLOBAL_WITH_DEBUG
If this bit is set, a global reset signal will be sent to the USB bus.
- This resets all of the USB bus logic, including the USB host
- controller hardware and all the devices attached on the USB bus.
- If this is an EHCI controller and the debug port has configured, then
+ This resets all of the USB bus logic, including the USB host
+ controller hardware and all the devices attached on the USB bus.
+ If this is an EHCI controller and the debug port has configured, then
this is will still reset the host controller.
EFI_USB_HC_RESET_HOST_WITH_DEBUG
- If this bit is set, the USB host controller hardware will be reset.
+ If this bit is set, the USB host controller hardware will be reset.
If this is an EHCI controller and the debug port has been configured,
then this will still reset the host controller.
-
+
Returns:
-
- EFI_SUCCESS
+
+ EFI_SUCCESS
The reset operation succeeded.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
Attributes is not valid.
EFI_UNSUPPOURTED
The type of reset specified by Attributes is not currently supported by
the host controller hardware.
EFI_ACCESS_DENIED
- Reset operation is rejected due to the debug port being configured and
- active; only EFI_USB_HC_RESET_GLOBAL_WITH_DEBUG or
+ Reset operation is rejected due to the debug port being configured and
+ active; only EFI_USB_HC_RESET_GLOBAL_WITH_DEBUG or
EFI_USB_HC_RESET_HOST_WITH_DEBUG reset Atrributes can be used to
perform reset operation for this host controller.
- EFI_DEVICE_ERROR
- An error was encountered while attempting to perform
+ EFI_DEVICE_ERROR
+ An error was encountered while attempting to perform
the reset operation.
-
+
--*/
{
EFI_STATUS Status;
@@ -2925,36 +2925,36 @@ UsbVirtualHcGetState ( OUT EFI_USB_HC_STATE *State
)
/*++
-
+
Routine Description:
-
+
Virtual interface to retrieves current state of the USB host controller
for both Hc2 and Hc protocol.
-
+
Arguments:
-
+
UsbBusDev - A pointer to bus controller of the device.
- State - A pointer to the EFI_USB_HC_STATE data structure that
- indicates current state of the USB host controller.
+ State - A pointer to the EFI_USB_HC_STATE data structure that
+ indicates current state of the USB host controller.
Type EFI_USB_HC_STATE is defined below.
-
+
typedef enum {
EfiUsbHcStateHalt,
EfiUsbHcStateOperational,
EfiUsbHcStateSuspend,
EfiUsbHcStateMaximum
} EFI_USB_HC_STATE;
-
+
Returns:
-
- EFI_SUCCESS
+
+ EFI_SUCCESS
The state information of the host controller was returned in State.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
State is NULL.
- EFI_DEVICE_ERROR
- An error was encountered while attempting to retrieve the
- host controller's current state.
-
+ EFI_DEVICE_ERROR
+ An error was encountered while attempting to retrieve the
+ host controller's current state.
+
--*/
{
EFI_STATUS Status;
@@ -2983,27 +2983,27 @@ UsbVirtualHcSetState ( IN EFI_USB_HC_STATE State
)
/*++
-
+
Routine Description:
-
+
Virtual interface to sets the USB host controller to a specific state
for both Hc2 and Hc protocol.
-
+
Arguments:
-
+
UsbBusDev - A pointer to bus controller of the device.
State - Indicates the state of the host controller that will be set.
-
+
Returns:
-
- EFI_SUCCESS
- The USB host controller was successfully placed in the state
+
+ EFI_SUCCESS
+ The USB host controller was successfully placed in the state
specified by State.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
State is invalid.
- EFI_DEVICE_ERROR
- Failed to set the state specified by State due to device error.
-
+ EFI_DEVICE_ERROR
+ Failed to set the state specified by State due to device error.
+
--*/
{
EFI_STATUS Status;
@@ -3033,29 +3033,29 @@ UsbVirtualHcGetRootHubPortStatus ( OUT EFI_USB_PORT_STATUS *PortStatus
)
/*++
-
+
Routine Description:
-
+
Virtual interface to retrieves the current status of a USB root hub port
both for Hc2 and Hc protocol.
-
+
Arguments:
-
+
UsbBusDev - A pointer to bus controller of the device.
- PortNumber - Specifies the root hub port from which the status
- is to be retrieved. This value is zero-based. For example,
+ PortNumber - Specifies the root hub port from which the status
+ is to be retrieved. This value is zero-based. For example,
if a root hub has two ports, then the first port is numbered 0,
and the second port is numbered 1.
- PortStatus - A pointer to the current port status bits and
- port status change bits.
-
+ PortStatus - A pointer to the current port status bits and
+ port status change bits.
+
Returns:
-
- EFI_SUCCESS The status of the USB root hub port specified by PortNumber
+
+ EFI_SUCCESS The status of the USB root hub port specified by PortNumber
was returned in PortStatus.
- EFI_INVALID_PARAMETER PortNumber is invalid.
- EFI_DEVICE_ERROR Can't read register
-
+ EFI_INVALID_PARAMETER PortNumber is invalid.
+ EFI_DEVICE_ERROR Can't read register
+
--*/
{
EFI_STATUS Status;
@@ -3087,29 +3087,29 @@ UsbVirtualHcSetRootHubPortFeature ( IN EFI_USB_PORT_FEATURE PortFeature
)
/*++
-
+
Routine Description:
Virual interface to sets a feature for the specified root hub port
for both Hc2 and Hc protocol.
-
+
Arguments:
-
+
UsbBusDev - A pointer to bus controller of the device.
- PortNumber - Specifies the root hub port whose feature
+ PortNumber - Specifies the root hub port whose feature
is requested to be set.
- PortFeature - Indicates the feature selector associated
- with the feature set request.
-
+ PortFeature - Indicates the feature selector associated
+ with the feature set request.
+
Returns:
-
- EFI_SUCCESS
- The feature specified by PortFeature was set for the
+
+ EFI_SUCCESS
+ The feature specified by PortFeature was set for the
USB root hub port specified by PortNumber.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
PortNumber is invalid or PortFeature is invalid.
EFI_DEVICE_ERROR
Can't read register
-
+
--*/
{
EFI_STATUS Status;
@@ -3141,30 +3141,30 @@ UsbVirtualHcClearRootHubPortFeature ( IN EFI_USB_PORT_FEATURE PortFeature
)
/*++
-
+
Routine Description:
-
+
Virtual interface to clears a feature for the specified root hub port
for both Hc2 and Hc protocol.
-
+
Arguments:
-
+
UsbBusDev - A pointer to bus controller of the device.
- PortNumber - Specifies the root hub port whose feature
+ PortNumber - Specifies the root hub port whose feature
is requested to be cleared.
- PortFeature - Indicates the feature selector associated with the
+ PortFeature - Indicates the feature selector associated with the
feature clear request.
-
+
Returns:
-
- EFI_SUCCESS
- The feature specified by PortFeature was cleared for the
+
+ EFI_SUCCESS
+ The feature specified by PortFeature was cleared for the
USB root hub port specified by PortNumber.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
PortNumber is invalid or PortFeature is invalid.
EFI_DEVICE_ERROR
Can't read register
-
+
--*/
{
EFI_STATUS Status;
@@ -3204,48 +3204,48 @@ UsbVirtualHcControlTransfer ( OUT UINT32 *TransferResult
)
/*++
-
+
Routine Description:
-
+
Virtual interface to submits control transfer to a target USB device
for both Hc2 and Hc protocol.
-
+
Arguments:
-
+
UsbBusDev - A pointer to bus controller of the device.
DeviceAddress - Represents the address of the target device on the USB,
which is assigned during USB enumeration.
DeviceSpeed - Indicates target device speed.
- MaximumPacketLength - Indicates the maximum packet size that the
- default control transfer endpoint is capable of
+ MaximumPacketLength - Indicates the maximum packet size that the
+ default control transfer endpoint is capable of
sending or receiving.
- Request - A pointer to the USB device request that will be sent
- to the USB device.
+ Request - A pointer to the USB device request that will be sent
+ to the USB device.
TransferDirection - Specifies the data direction for the transfer.
- There are three values available, DataIn, DataOut
+ There are three values available, DataIn, DataOut
and NoData.
- Data - A pointer to the buffer of data that will be transmitted
+ Data - A pointer to the buffer of data that will be transmitted
to USB device or received from USB device.
- DataLength - Indicates the size, in bytes, of the data buffer
+ DataLength - Indicates the size, in bytes, of the data buffer
specified by Data.
- TimeOut - Indicates the maximum time, in microseconds,
+ TimeOut - Indicates the maximum time, in microseconds,
which the transfer is allowed to complete.
Translator - A pointr to the transaction translator data.
- TransferResult - A pointer to the detailed result information generated
+ TransferResult - A pointer to the detailed result information generated
by this control transfer.
-
+
Returns:
-
- EFI_SUCCESS
+
+ EFI_SUCCESS
The control transfer was completed successfully.
- EFI_OUT_OF_RESOURCES
+ EFI_OUT_OF_RESOURCES
The control transfer could not be completed due to a lack of resources.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
Some parameters are invalid.
- EFI_TIMEOUT
+ EFI_TIMEOUT
The control transfer failed due to timeout.
- EFI_DEVICE_ERROR
- The control transfer failed due to host controller or device error.
+ EFI_DEVICE_ERROR
+ The control transfer failed due to host controller or device error.
Caller should check TranferResult for detailed error information.
--*/
@@ -3305,55 +3305,55 @@ UsbVirtualHcBulkTransfer ( OUT UINT32 *TransferResult
)
/*++
-
+
Routine Description:
-
+
Virtual interface to submits bulk transfer to a bulk endpoint of a USB device
both for Hc2 and Hc protocol.
-
+
Arguments:
-
+
UsbBusDev - A pointer to bus controller of the device.
DeviceAddress - Represents the address of the target device on the USB,
- which is assigned during USB enumeration.
- EndPointAddress - The combination of an endpoint number and an
- endpoint direction of the target USB device.
- Each endpoint address supports data transfer in
- one direction except the control endpoint
- (whose default endpoint address is 0).
- It is the caller's responsibility to make sure that
- the EndPointAddress represents a bulk endpoint.
+ which is assigned during USB enumeration.
+ EndPointAddress - The combination of an endpoint number and an
+ endpoint direction of the target USB device.
+ Each endpoint address supports data transfer in
+ one direction except the control endpoint
+ (whose default endpoint address is 0).
+ It is the caller's responsibility to make sure that
+ the EndPointAddress represents a bulk endpoint.
DeviceSpeed - Indicates device speed. The supported values are EFI_USB_SPEED_FULL
and EFI_USB_SPEED_HIGH.
MaximumPacketLength - Indicates the maximum packet size the target endpoint
- is capable of sending or receiving.
+ is capable of sending or receiving.
DataBuffersNumber - Number of data buffers prepared for the transfer.
- Data - Array of pointers to the buffers of data that will be transmitted
- to USB device or received from USB device.
+ Data - Array of pointers to the buffers of data that will be transmitted
+ to USB device or received from USB device.
DataLength - When input, indicates the size, in bytes, of the data buffer
- specified by Data. When output, indicates the actually
- transferred data size.
- DataToggle - A pointer to the data toggle value. On input, it indicates
+ specified by Data. When output, indicates the actually
+ transferred data size.
+ DataToggle - A pointer to the data toggle value. On input, it indicates
the initial data toggle value the bulk transfer should adopt;
- on output, it is updated to indicate the data toggle value
- of the subsequent bulk transfer.
- Translator - A pointr to the transaction translator data.
- TimeOut - Indicates the maximum time, in microseconds, which the
- transfer is allowed to complete.
- TransferResult - A pointer to the detailed result information of the
+ on output, it is updated to indicate the data toggle value
+ of the subsequent bulk transfer.
+ Translator - A pointr to the transaction translator data.
+ TimeOut - Indicates the maximum time, in microseconds, which the
+ transfer is allowed to complete.
+ TransferResult - A pointer to the detailed result information of the
bulk transfer.
Returns:
-
- EFI_SUCCESS
+
+ EFI_SUCCESS
The bulk transfer was completed successfully.
- EFI_OUT_OF_RESOURCES
+ EFI_OUT_OF_RESOURCES
The bulk transfer could not be submitted due to lack of resource.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
Some parameters are invalid.
- EFI_TIMEOUT
+ EFI_TIMEOUT
The bulk transfer failed due to timeout.
- EFI_DEVICE_ERROR
+ EFI_DEVICE_ERROR
The bulk transfer failed due to host controller or device error.
Caller should check TranferResult for detailed error information.
@@ -3412,63 +3412,63 @@ UsbVirtualHcAsyncInterruptTransfer ( IN VOID *Context OPTIONAL
)
/*++
-
+
Routine Description:
-
- Virtual interface to submits an asynchronous interrupt transfer to an
+
+ Virtual interface to submits an asynchronous interrupt transfer to an
interrupt endpoint of a USB device for both Hc2 and Hc protocol.
-
+
Arguments:
-
+
UsbBusDev - A pointer to bus controller of the device.
DeviceAddress - Represents the address of the target device on the USB,
- which is assigned during USB enumeration.
- EndPointAddress - The combination of an endpoint number and an endpoint
- direction of the target USB device. Each endpoint address
- supports data transfer in one direction except the
- control endpoint (whose default endpoint address is 0).
- It is the caller's responsibility to make sure that
- the EndPointAddress represents an interrupt endpoint.
+ which is assigned during USB enumeration.
+ EndPointAddress - The combination of an endpoint number and an endpoint
+ direction of the target USB device. Each endpoint address
+ supports data transfer in one direction except the
+ control endpoint (whose default endpoint address is 0).
+ It is the caller's responsibility to make sure that
+ the EndPointAddress represents an interrupt endpoint.
DeviceSpeed - Indicates device speed.
MaximumPacketLength - Indicates the maximum packet size the target endpoint
- is capable of sending or receiving.
+ is capable of sending or receiving.
IsNewTransfer - If TRUE, an asynchronous interrupt pipe is built between
- the host and the target interrupt endpoint.
- If FALSE, the specified asynchronous interrupt pipe
- is canceled.
- DataToggle - A pointer to the data toggle value. On input, it is valid
- when IsNewTransfer is TRUE, and it indicates the initial
- data toggle value the asynchronous interrupt transfer
- should adopt.
- On output, it is valid when IsNewTransfer is FALSE,
- and it is updated to indicate the data toggle value of
- the subsequent asynchronous interrupt transfer.
- PollingInterval - Indicates the interval, in milliseconds, that the
- asynchronous interrupt transfer is polled.
- This parameter is required when IsNewTransfer is TRUE.
- DataLength - Indicates the length of data to be received at the
- rate specified by PollingInterval from the target
- asynchronous interrupt endpoint. This parameter
- is only required when IsNewTransfer is TRUE.
+ the host and the target interrupt endpoint.
+ If FALSE, the specified asynchronous interrupt pipe
+ is canceled.
+ DataToggle - A pointer to the data toggle value. On input, it is valid
+ when IsNewTransfer is TRUE, and it indicates the initial
+ data toggle value the asynchronous interrupt transfer
+ should adopt.
+ On output, it is valid when IsNewTransfer is FALSE,
+ and it is updated to indicate the data toggle value of
+ the subsequent asynchronous interrupt transfer.
+ PollingInterval - Indicates the interval, in milliseconds, that the
+ asynchronous interrupt transfer is polled.
+ This parameter is required when IsNewTransfer is TRUE.
+ DataLength - Indicates the length of data to be received at the
+ rate specified by PollingInterval from the target
+ asynchronous interrupt endpoint. This parameter
+ is only required when IsNewTransfer is TRUE.
Translator - A pointr to the transaction translator data.
- CallBackFunction - The Callback function.This function is called at the
- rate specified by PollingInterval.This parameter is
- only required when IsNewTransfer is TRUE.
+ CallBackFunction - The Callback function.This function is called at the
+ rate specified by PollingInterval.This parameter is
+ only required when IsNewTransfer is TRUE.
Context - The context that is passed to the CallBackFunction.
- This is an optional parameter and may be NULL.
-
+
Returns:
-
- EFI_SUCCESS
- The asynchronous interrupt transfer request has been successfully
+
+ EFI_SUCCESS
+ The asynchronous interrupt transfer request has been successfully
submitted or canceled.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
Some parameters are invalid.
- EFI_OUT_OF_RESOURCES
- The request could not be completed due to a lack of resources.
+ EFI_OUT_OF_RESOURCES
+ The request could not be completed due to a lack of resources.
EFI_DEVICE_ERROR
Can't read register
-
+
--*/
{
EFI_STATUS Status;
@@ -3527,58 +3527,58 @@ UsbVirtualHcSyncInterruptTransfer ( OUT UINT32 *TransferResult
)
/*++
-
+
Routine Description:
-
- Vitual interface to submits synchronous interrupt transfer to an interrupt endpoint
+
+ Vitual interface to submits synchronous interrupt transfer to an interrupt endpoint
of a USB device for both Hc2 and Hc protocol.
-
+
Arguments:
-
+
UsbBusDev - A pointer to bus controller of the device.
- DeviceAddress - Represents the address of the target device on the USB,
+ DeviceAddress - Represents the address of the target device on the USB,
which is assigned during USB enumeration.
- EndPointAddress - The combination of an endpoint number and an endpoint
- direction of the target USB device. Each endpoint
- address supports data transfer in one direction
- except the control endpoint (whose default
+ EndPointAddress - The combination of an endpoint number and an endpoint
+ direction of the target USB device. Each endpoint
+ address supports data transfer in one direction
+ except the control endpoint (whose default
endpoint address is 0). It is the caller's responsibility
- to make sure that the EndPointAddress represents
- an interrupt endpoint.
+ to make sure that the EndPointAddress represents
+ an interrupt endpoint.
DeviceSpeed - Indicates device speed.
- MaximumPacketLength - Indicates the maximum packet size the target endpoint
+ MaximumPacketLength - Indicates the maximum packet size the target endpoint
is capable of sending or receiving.
- Data - A pointer to the buffer of data that will be transmitted
+ Data - A pointer to the buffer of data that will be transmitted
to USB device or received from USB device.
- DataLength - On input, the size, in bytes, of the data buffer specified
+ DataLength - On input, the size, in bytes, of the data buffer specified
by Data. On output, the number of bytes transferred.
DataToggle - A pointer to the data toggle value. On input, it indicates
- the initial data toggle value the synchronous interrupt
- transfer should adopt;
- on output, it is updated to indicate the data toggle value
- of the subsequent synchronous interrupt transfer.
- TimeOut - Indicates the maximum time, in microseconds, which the
+ the initial data toggle value the synchronous interrupt
+ transfer should adopt;
+ on output, it is updated to indicate the data toggle value
+ of the subsequent synchronous interrupt transfer.
+ TimeOut - Indicates the maximum time, in microseconds, which the
transfer is allowed to complete.
Translator - A pointr to the transaction translator data.
- TransferResult - A pointer to the detailed result information from
- the synchronous interrupt transfer.
+ TransferResult - A pointer to the detailed result information from
+ the synchronous interrupt transfer.
Returns:
-
- EFI_SUCCESS
+
+ EFI_SUCCESS
The synchronous interrupt transfer was completed successfully.
- EFI_OUT_OF_RESOURCES
- The synchronous interrupt transfer could not be submitted due
+ EFI_OUT_OF_RESOURCES
+ The synchronous interrupt transfer could not be submitted due
to lack of resource.
- EFI_INVALID_PARAMETER
+ EFI_INVALID_PARAMETER
Some parameters are invalid.
- EFI_TIMEOUT
+ EFI_TIMEOUT
The synchronous interrupt transfer failed due to timeout.
- EFI_DEVICE_ERROR
- The synchronous interrupt transfer failed due to host controller
- or device error. Caller should check TranferResult for detailed
- error information.
-
+ EFI_DEVICE_ERROR
+ The synchronous interrupt transfer failed due to host controller
+ or device error. Caller should check TranferResult for detailed
+ error information.
+
--*/
{
EFI_STATUS Status;
@@ -3634,34 +3634,34 @@ UsbVirtualHcIsochronousTransfer ( OUT UINT32 *TransferResult
)
/*++
-
+
Routine Description:
-
+
Virtual interface to submits isochronous transfer to a target USB device
for both Hc2 and Hc protocol.
-
+
Arguments:
-
+
UsbBusDev - A pointer to bus controller of the device.
DeviceAddress - Represents the address of the target device on the USB,
which is assigned during USB enumeration.
EndPointAddress - End point address
DeviceSpeed - Indicates device speed.
- MaximumPacketLength - Indicates the maximum packet size that the
- default control transfer endpoint is capable of
+ MaximumPacketLength - Indicates the maximum packet size that the
+ default control transfer endpoint is capable of
sending or receiving.
DataBuffersNumber - Number of data buffers prepared for the transfer.
- Data - Array of pointers to the buffers of data that will be
+ Data - Array of pointers to the buffers of data that will be
transmitted to USB device or received from USB device.
- DataLength - Indicates the size, in bytes, of the data buffer
+ DataLength - Indicates the size, in bytes, of the data buffer
specified by Data.
Translator - A pointr to the transaction translator data.
- TransferResult - A pointer to the detailed result information generated
- by this control transfer.
-
+ TransferResult - A pointer to the detailed result information generated
+ by this control transfer.
+
Returns:
-
- EFI_UNSUPPORTED
+
+ EFI_UNSUPPORTED
--*/
{
@@ -3684,34 +3684,34 @@ UsbVirtualHcAsyncIsochronousTransfer ( IN VOID *Context
)
/*++
-
+
Routine Description:
-
+
Vitual interface to submits Async isochronous transfer to a target USB device
for both Hc2 and Hc protocol.
-
+
Arguments:
-
+
UsbBusDev - A pointer to bus controller of the device.
DeviceAddress - Represents the address of the target device on the USB,
which is assigned during USB enumeration.
EndPointAddress - End point address
DeviceSpeed - Indicates device speed.
- MaximumPacketLength - Indicates the maximum packet size that the
- default control transfer endpoint is capable of
+ MaximumPacketLength - Indicates the maximum packet size that the
+ default control transfer endpoint is capable of
sending or receiving.
DataBuffersNumber - Number of data buffers prepared for the transfer.
- Data - Array of pointers to the buffers of data that will be transmitted
+ Data - Array of pointers to the buffers of data that will be transmitted
to USB device or received from USB device.
- DataLength - Indicates the size, in bytes, of the data buffer
+ DataLength - Indicates the size, in bytes, of the data buffer
specified by Data.
Translator - A pointr to the transaction translator data.
IsochronousCallBack - When the transfer complete, the call back function will be called
Context - Pass to the call back function as parameter
-
+
Returns:
-
- EFI_UNSUPPORTED
+
+ EFI_UNSUPPORTED
--*/
{
diff --git a/EdkModulePkg/Bus/Usb/UsbKb/Dxe/efikey.c b/EdkModulePkg/Bus/Usb/UsbKb/Dxe/efikey.c index a1fd418..069e31d 100644 --- a/EdkModulePkg/Bus/Usb/UsbKb/Dxe/efikey.c +++ b/EdkModulePkg/Bus/Usb/UsbKb/Dxe/efikey.c @@ -1,18 +1,18 @@ /*++
-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:
EfiKey.c
-
+
Abstract:
USB Keyboard Driver
@@ -80,18 +80,18 @@ USBKeyboardDriverBindingSupported ( IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath
)
/*++
-
+
Routine Description:
Supported.
-
+
Arguments:
This - EFI_DRIVER_BINDING_PROTOCOL
Controller - Controller handle
- RemainingDevicePath - EFI_DEVICE_PATH_PROTOCOL
+ RemainingDevicePath - EFI_DEVICE_PATH_PROTOCOL
Returns:
EFI_STATUS
-
---*/
+
+--*/
{
EFI_STATUS OpenStatus;
EFI_USB_IO_PROTOCOL *UsbIo;
@@ -111,7 +111,7 @@ USBKeyboardDriverBindingSupported ( if (EFI_ERROR (OpenStatus)) {
return OpenStatus;
}
-
+
//
// Use the USB I/O protocol interface to check whether the Controller is
// the Keyboard controller that can be managed by this driver.
@@ -140,10 +140,10 @@ USBKeyboardDriverBindingStart ( IN EFI_DEVICE_PATH_PROTOCOL *RemainingDevicePath
)
/*++
-
+
Routine Description:
Start.
-
+
Arguments:
This - EFI_DRIVER_BINDING_PROTOCOL
Controller - Controller handle
@@ -152,8 +152,8 @@ USBKeyboardDriverBindingStart ( EFI_SUCCESS - Success
EFI_OUT_OF_RESOURCES - Can't allocate memory
EFI_UNSUPPORTED - The Start routine fail
---*/
-{
+--*/
+{
EFI_STATUS Status;
EFI_USB_IO_PROTOCOL *UsbIo;
USB_KB_DEV *UsbKeyboardDevice;
@@ -164,7 +164,7 @@ USBKeyboardDriverBindingStart ( UINT8 PollingInterval;
UINT8 PacketSize;
BOOLEAN Found;
-
+
UsbKeyboardDevice = NULL;
Found = FALSE;
@@ -283,8 +283,8 @@ USBKeyboardDriverBindingStart ( UsbKeyboardDevice->SimpleInput.Reset = USBKeyboardReset;
UsbKeyboardDevice->SimpleInput.ReadKeyStroke = USBKeyboardReadKeyStroke;
Status = gBS->CreateEvent (
- EFI_EVENT_NOTIFY_WAIT,
- EFI_TPL_NOTIFY,
+ EVT_NOTIFY_WAIT,
+ TPL_NOTIFY,
USBKeyboardWaitForKey,
UsbKeyboardDevice,
&(UsbKeyboardDevice->SimpleInput.WaitForKey)
@@ -300,7 +300,7 @@ USBKeyboardDriverBindingStart ( );
return Status;
}
-
+
//
// Install simple txt in protocol interface
// for the usb keyboard device.
@@ -328,7 +328,7 @@ USBKeyboardDriverBindingStart ( );
return Status;
}
-
+
//
// Reset USB Keyboard Device
//
@@ -414,19 +414,19 @@ USBKeyboardDriverBindingStop ( IN EFI_HANDLE *ChildHandleBuffer
)
/*++
-
+
Routine Description:
Stop.
-
+
Arguments:
This - EFI_DRIVER_BINDING_PROTOCOL
Controller - Controller handle
NumberOfChildren - Child handle number
- ChildHandleBuffer - Child handle buffer
+ ChildHandleBuffer - Child handle buffer
Returns:
EFI_SUCCESS - Success
- EFI_UNSUPPORTED - Can't support
---*/
+ EFI_UNSUPPORTED - Can't support
+--*/
{
EFI_STATUS Status;
EFI_SIMPLE_TEXT_IN_PROTOCOL *SimpleInput;
@@ -443,7 +443,7 @@ USBKeyboardDriverBindingStop ( if (EFI_ERROR (Status)) {
return EFI_UNSUPPORTED;
}
-
+
//
// Get USB_KB_DEV instance.
//
@@ -522,17 +522,17 @@ USBKeyboardReset ( Routine Description:
Implements EFI_SIMPLE_TEXT_IN_PROTOCOL.Reset() function.
-
+
Arguments:
This The EFI_SIMPLE_TEXT_IN_PROTOCOL instance.
ExtendedVerification
Indicates that the driver may perform a more exhaustive
- verification operation of the device during reset.
-
- Returns:
+ verification operation of the device during reset.
+
+ Returns:
EFI_SUCCESS - Success
EFI_DEVICE_ERROR - Hardware Error
---*/
+--*/
{
EFI_STATUS Status;
USB_KB_DEV *UsbKeyboardDevice;
@@ -563,7 +563,7 @@ USBKeyboardReset ( UsbKeyboardDevice->CurKeyChar = 0;
return EFI_SUCCESS;
}
-
+
//
// Exhaustive reset
//
@@ -587,15 +587,15 @@ USBKeyboardReadKeyStroke ( Routine Description:
Implements EFI_SIMPLE_TEXT_IN_PROTOCOL.ReadKeyStroke() function.
-
+
Arguments:
This The EFI_SIMPLE_TEXT_IN_PROTOCOL instance.
Key A pointer to a buffer that is filled in with the keystroke
information for the key that was pressed.
-
- Returns:
+
+ Returns:
EFI_SUCCESS - Success
---*/
+--*/
{
USB_KB_DEV *UsbKeyboardDevice;
EFI_STATUS Status;
@@ -640,15 +640,15 @@ USBKeyboardWaitForKey ( /*++
Routine Description:
- Handler function for WaitForKey event.
-
+ Handler function for WaitForKey event.
+
Arguments:
Event Event to be signaled when a key is pressed.
Context Points to USB_KB_DEV instance.
-
- Returns:
+
+ Returns:
VOID
---*/
+--*/
{
USB_KB_DEV *UsbKeyboardDevice;
@@ -676,13 +676,13 @@ USBKeyboardCheckForKey ( Routine Description:
Check whether there is key pending.
-
+
Arguments:
UsbKeyboardDevice The USB_KB_DEV instance.
-
- Returns:
+
+ Returns:
EFI_SUCCESS - Success
---*/
+--*/
{
EFI_STATUS Status;
UINT8 KeyChar;
diff --git a/EdkModulePkg/Bus/Usb/UsbKb/Dxe/keyboard.c b/EdkModulePkg/Bus/Usb/UsbKb/Dxe/keyboard.c index 64bbd30..d81a976 100644 --- a/EdkModulePkg/Bus/Usb/UsbKb/Dxe/keyboard.c +++ b/EdkModulePkg/Bus/Usb/UsbKb/Dxe/keyboard.c @@ -1,18 +1,18 @@ /*++
-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:
Keyboard.c
-
+
Abstract:
Helper functions for USB Keyboard Driver
@@ -85,8 +85,8 @@ UINT8 KeyConvertionTable[USB_KEYCODE_MAX_MAKE][3] = { { SCAN_NULL, 0x00, 0x00 }, // 0x39 CapsLock
{ SCAN_F1, 0x00, 0x00 }, // 0x3A
{ SCAN_F2, 0x00, 0x00 }, // 0x3B
- { SCAN_F3, 0x00, 0x00 }, // 0x3C
- { SCAN_F4, 0x00, 0x00 }, // 0x3D
+ { SCAN_F3, 0x00, 0x00 }, // 0x3C
+ { SCAN_F4, 0x00, 0x00 }, // 0x3D
{ SCAN_F5, 0x00, 0x00 }, // 0x3E
{ SCAN_F6, 0x00, 0x00 }, // 0x3F
{ SCAN_F7, 0x00, 0x00 }, // 0x40
@@ -132,14 +132,14 @@ UINT8 KeyConvertionTable[USB_KEYCODE_MAX_MAKE][3] = { };
STATIC KB_MODIFIER KB_Mod[8] = {
- { MOD_CONTROL_L, 0xe0 }, // 11100000
- { MOD_CONTROL_R, 0xe4 }, // 11100100
- { MOD_SHIFT_L, 0xe1 }, // 11100001
- { MOD_SHIFT_R, 0xe5 }, // 11100101
- { MOD_ALT_L, 0xe2 }, // 11100010
- { MOD_ALT_R, 0xe6 }, // 11100110
- { MOD_WIN_L, 0xe3 }, // 11100011
- { MOD_WIN_R, 0xe7 } // 11100111
+ { MOD_CONTROL_L, 0xe0 }, // 11100000
+ { MOD_CONTROL_R, 0xe4 }, // 11100100
+ { MOD_SHIFT_L, 0xe1 }, // 11100001
+ { MOD_SHIFT_R, 0xe5 }, // 11100101
+ { MOD_ALT_L, 0xe2 }, // 11100010
+ { MOD_ALT_R, 0xe6 }, // 11100110
+ { MOD_WIN_L, 0xe3 }, // 11100011
+ { MOD_WIN_R, 0xe7 } // 11100111
};
@@ -148,16 +148,16 @@ IsUSBKeyboard ( IN EFI_USB_IO_PROTOCOL *UsbIo
)
/*++
-
+
Routine Description:
Uses USB I/O to check whether the device is a USB Keyboard device.
-
+
Arguments:
UsbIo: Points to a USB I/O protocol instance.
-
+
Returns:
-
---*/
+
+--*/
{
EFI_STATUS Status;
EFI_USB_INTERFACE_DESCRIPTOR InterfaceDescriptor;
@@ -192,13 +192,13 @@ InitUSBKeyboard ( IN USB_KB_DEV *UsbKeyboardDevice
)
/*++
-
+
Routine Description:
Initialize USB Keyboard device and all private data structures.
-
+
Arguments:
UsbKeyboardDevice The USB_KB_DEV instance.
-
+
Returns:
EFI_SUCCESS - Success
EFI_DEVICE_ERROR - Hardware Error
@@ -289,7 +289,7 @@ InitUSBKeyboard ( UsbKeyboardDevice->ShiftOn = 0;
UsbKeyboardDevice->NumLockOn = 0;
UsbKeyboardDevice->CapsOn = 0;
- UsbKeyboardDevice->ScrollOn = 0;
+ UsbKeyboardDevice->ScrollOn = 0;
ZeroMem (UsbKeyboardDevice->LastKeyCodeArray, sizeof (UINT8) * 8);
//
@@ -301,8 +301,8 @@ InitUSBKeyboard ( }
Status = gBS->CreateEvent (
- EFI_EVENT_TIMER | EFI_EVENT_NOTIFY_SIGNAL,
- EFI_TPL_NOTIFY,
+ EVT_TIMER | EVT_NOTIFY_SIGNAL,
+ TPL_NOTIFY,
USBKeyboardRepeatHandler,
UsbKeyboardDevice,
&UsbKeyboardDevice->RepeatTimer
@@ -314,8 +314,8 @@ InitUSBKeyboard ( }
Status = gBS->CreateEvent (
- EFI_EVENT_TIMER | EFI_EVENT_NOTIFY_SIGNAL,
- EFI_TPL_NOTIFY,
+ EVT_TIMER | EVT_NOTIFY_SIGNAL,
+ TPL_NOTIFY,
USBKeyboardRecoveryHandler,
UsbKeyboardDevice,
&UsbKeyboardDevice->DelayedRecoveryEvent
@@ -333,21 +333,21 @@ KeyboardHandler ( IN UINT32 Result
)
/*++
-
+
Routine Description:
Handler function for USB Keyboard's asynchronous interrupt transfer.
-
+
Arguments:
Data A pointer to a buffer that is filled with key data which is
retrieved via asynchronous interrupt transfer.
DataLength Indicates the size of the data buffer.
Context Pointing to USB_KB_DEV instance.
Result Indicates the result of the asynchronous interrupt transfer.
-
+
Returns:
EFI_SUCCESS - Success
EFI_DEVICE_ERROR - Hardware Error
---*/
+--*/
{
USB_KB_DEV *UsbKeyboardDevice;
EFI_USB_IO_PROTOCOL *UsbIo;
@@ -402,11 +402,11 @@ KeyboardHandler ( &UsbStatus
);
}
-
+
//
// Delete & Submit this interrupt again
//
-
+
UsbIo->UsbAsyncInterruptTransfer (
UsbIo,
UsbKeyboardDevice->IntEndpointDescriptor.EndpointAddress,
@@ -446,7 +446,7 @@ KeyboardHandler ( if (Index == 8) {
return EFI_SUCCESS;
}
-
+
//
// Parse the modifier key
//
@@ -469,7 +469,7 @@ KeyboardHandler ( InsertKeyCode (&(UsbKeyboardDevice->KeyboardBuffer), KB_Mod[Index].Key, Down);
}
}
-
+
//
// handle normal key's releasing situation
//
@@ -507,7 +507,7 @@ KeyboardHandler ( }
}
}
-
+
//
// original repeat key is released, cancel the repeat timer
//
@@ -518,7 +518,7 @@ KeyboardHandler ( USBKBD_REPEAT_RATE
);
}
-
+
//
// handle normal key's pressing situation
//
@@ -558,7 +558,7 @@ KeyboardHandler ( }
}
}
-
+
//
// Update LastKeycodeArray[] buffer in the
// Usb Keyboard Device data structure.
@@ -566,7 +566,7 @@ KeyboardHandler ( for (Index = 0; Index < 8; Index++) {
UsbKeyboardDevice->LastKeyCodeArray[Index] = CurKeyCodeBuffer[Index];
}
-
+
//
// pre-process KeyboardBuffer, pop out the ctrl,alt,del key in sequence
// and judge whether it will invoke reset event.
@@ -611,7 +611,7 @@ KeyboardHandler ( default:
break;
}
-
+
//
// insert the key back to the buffer.
// so the key sequence will not be destroyed.
@@ -651,18 +651,18 @@ USBParseKey ( OUT UINT8 *KeyChar
)
/*++
-
+
Routine Description:
Retrieves a key character after parsing the raw data in keyboard buffer.
-
+
Arguments:
UsbKeyboardDevice The USB_KB_DEV instance.
KeyChar Points to the Key character after key parsing.
-
+
Returns:
EFI_SUCCESS - Success
- EFI_NOT_READY - Device is not ready
---*/
+ EFI_NOT_READY - Device is not ready
+--*/
{
USB_KEY UsbKey;
@@ -698,7 +698,7 @@ USBParseKey ( continue;
}
-
+
//
// Analyzes key pressing situation
//
@@ -762,7 +762,7 @@ USBParseKey ( UsbKeyboardDevice->ScrollOn ^= 1;
SetKeyLED (UsbKeyboardDevice);
continue;
- break;
+ break;
case 0x48:
//
// fall through
@@ -775,7 +775,7 @@ USBParseKey ( default:
break;
}
-
+
//
// When encountered Del Key...
//
@@ -801,15 +801,15 @@ USBKeyCodeToEFIScanCode ( OUT EFI_INPUT_KEY *Key
)
/*++
-
+
Routine Description:
Converts USB Keyboard code to EFI Scan Code.
-
- Arguments:
+
+ Arguments:
UsbKeyboardDevice The USB_KB_DEV instance.
- KeyChar Indicates the key code that will be interpreted.
- Key A pointer to a buffer that is filled in with
- the keystroke information for the key that
+ KeyChar Indicates the key code that will be interpreted.
+ Key A pointer to a buffer that is filled in with
+ the keystroke information for the key that
was pressed.
Returns:
EFI_NOT_READY - Device is not ready
@@ -821,7 +821,7 @@ USBKeyCodeToEFIScanCode ( if (!USBKBD_VALID_KEYCODE (KeyChar)) {
return EFI_NOT_READY;
}
-
+
//
// valid USB Key Code starts from 4
//
@@ -881,16 +881,16 @@ InitUSBKeyBuffer ( IN OUT USB_KB_BUFFER *KeyboardBuffer
)
/*++
-
+
Routine Description:
Resets USB Keyboard Buffer.
-
+
Arguments:
KeyboardBuffer - Points to the USB Keyboard Buffer.
-
+
Returns:
EFI_SUCCESS - Success
---*/
+--*/
{
ZeroMem (KeyboardBuffer, sizeof (USB_KB_BUFFER));
@@ -904,15 +904,15 @@ IsUSBKeyboardBufferEmpty ( IN USB_KB_BUFFER *KeyboardBuffer
)
/*++
-
+
Routine Description:
Check whether USB Keyboard buffer is empty.
-
+
Arguments:
KeyboardBuffer - USB Keyboard Buffer.
-
+
Returns:
-
+
--*/
{
//
@@ -927,18 +927,18 @@ IsUSBKeyboardBufferFull ( IN USB_KB_BUFFER *KeyboardBuffer
)
/*++
-
+
Routine Description:
Check whether USB Keyboard buffer is full.
-
+
Arguments:
KeyboardBuffer - USB Keyboard Buffer.
-
+
Returns:
-
+
--*/
{
- return (BOOLEAN)(((KeyboardBuffer->bTail + 1) % (MAX_KEY_ALLOWED + 1)) ==
+ return (BOOLEAN)(((KeyboardBuffer->bTail + 1) % (MAX_KEY_ALLOWED + 1)) ==
KeyboardBuffer->bHead);
}
@@ -950,10 +950,10 @@ InsertKeyCode ( IN UINT8 Down
)
/*++
-
+
Routine Description:
Inserts a key code into keyboard buffer.
-
+
Arguments:
KeyboardBuffer - Points to the USB Keyboard Buffer.
Key - Key code
@@ -989,18 +989,18 @@ RemoveKeyCode ( OUT USB_KEY *UsbKey
)
/*++
-
+
Routine Description:
Pops a key code off from keyboard buffer.
-
+
Arguments:
KeyboardBuffer - Points to the USB Keyboard Buffer.
UsbKey - Points to the buffer that contains a usb key code.
-
+
Returns:
EFI_SUCCESS - Success
EFI_DEVICE_ERROR - Hardware Error
---*/
+--*/
{
if (IsUSBKeyboardBufferEmpty (KeyboardBuffer)) {
return EFI_DEVICE_ERROR;
@@ -1022,16 +1022,16 @@ SetKeyLED ( IN USB_KB_DEV *UsbKeyboardDevice
)
/*++
-
+
Routine Description:
Sets USB Keyboard LED state.
-
+
Arguments:
UsbKeyboardDevice - The USB_KB_DEV instance.
-
+
Returns:
EFI_SUCCESS - Success
---*/
+--*/
{
LED_MAP Led;
UINT8 ReportId;
@@ -1041,7 +1041,7 @@ SetKeyLED ( //
Led.NumLock = (UINT8) UsbKeyboardDevice->NumLockOn;
Led.CapsLock = (UINT8) UsbKeyboardDevice->CapsOn;
- Led.ScrollLock = (UINT8) UsbKeyboardDevice->ScrollOn;
+ Led.ScrollLock = (UINT8) UsbKeyboardDevice->ScrollOn;
Led.Resrvd = 0;
ReportId = 0;
@@ -1067,17 +1067,17 @@ USBKeyboardRepeatHandler ( IN VOID *Context
)
/*++
-
+
Routine Description:
Timer handler for Repeat Key timer.
-
+
Arguments:
Event - The Repeat Key event.
Context - Points to the USB_KB_DEV instance.
-
+
Returns:
-
---*/
+
+--*/
{
USB_KB_DEV *UsbKeyboardDevice;
@@ -1115,17 +1115,17 @@ USBKeyboardRecoveryHandler ( IN VOID *Context
)
/*++
-
+
Routine Description:
Timer handler for Delayed Recovery timer.
-
+
Arguments:
Event - The Delayed Recovery event.
Context - Points to the USB_KB_DEV instance.
-
+
Returns:
-
---*/
+
+--*/
{
USB_KB_DEV *UsbKeyboardDevice;
diff --git a/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.c b/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.c index 9caa006..daaf3f8 100644 --- a/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.c +++ b/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.c @@ -352,7 +352,7 @@ USBFloppyReset ( EFI_STATUS Status;
EFI_TPL OldTpl;
- OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);
+ OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
UsbFloppyDevice = USB_FLOPPY_DEV_FROM_THIS (This);
@@ -426,7 +426,7 @@ USBFloppyReadBlocks ( return EFI_SUCCESS;
}
- OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);
+ OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
UsbFloppyTestUnitReady (UsbFloppyDevice);
@@ -572,7 +572,7 @@ USBFloppyWriteBlocks ( return EFI_SUCCESS;
}
- OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);
+ OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
UsbFloppyTestUnitReady (UsbFloppyDevice);
diff --git a/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/usbmouse.c b/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/usbmouse.c index f7449eb..a3fc6c7 100644 --- a/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/usbmouse.c +++ b/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/usbmouse.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:
@@ -127,7 +127,7 @@ USBMouseDriverBindingSupported ( if (OpenStatus == EFI_ALREADY_STARTED) {
return EFI_ALREADY_STARTED;
}
-
+
//
// Use the USB I/O protocol interface to see the Controller is
// the Mouse controller that can be managed by this driver.
@@ -283,8 +283,8 @@ USBMouseDriverBindingStart ( UsbMouseDevice->SimplePointerProtocol.Mode = &UsbMouseDevice->Mode;
Status = gBS->CreateEvent (
- EFI_EVENT_NOTIFY_WAIT,
- EFI_TPL_NOTIFY,
+ EVT_NOTIFY_WAIT,
+ TPL_NOTIFY,
UsbMouseWaitForInput,
UsbMouseDevice,
&((UsbMouseDevice->SimplePointerProtocol).WaitForInput)
@@ -304,13 +304,13 @@ USBMouseDriverBindingStart ( Status = EFI_DEVICE_ERROR;
goto ErrorExit;
}
-
+
//
// After Enabling Async Interrupt Transfer on this mouse Device
// we will be able to get key data from it. Thus this is deemed as
// the enable action of the mouse
//
-
+
MouseReportStatusCode (
UsbMouseDevice->DevicePath,
EFI_PROGRESS_CODE,
@@ -677,8 +677,8 @@ InitializeUsbMouseDevice ( }
Status = gBS->CreateEvent (
- EFI_EVENT_TIMER | EFI_EVENT_NOTIFY_SIGNAL,
- EFI_TPL_NOTIFY,
+ EVT_TIMER | EVT_NOTIFY_SIGNAL,
+ TPL_NOTIFY,
USBMouseRecoveryHandler,
UsbMouseDev,
&UsbMouseDev->DelayedRecoveryEvent
@@ -805,11 +805,11 @@ GetMouseState ( Routine Description:
Get the mouse state, see SIMPLE POINTER PROTOCOL.
-
+
Arguments:
This - Protocol instance pointer.
MouseState - Current mouse state
-
+
Returns:
EFI_SUCCESS
EFI_DEVICE_ERROR
@@ -858,11 +858,11 @@ UsbMouseReset ( Routine Description:
Reset the mouse device, see SIMPLE POINTER PROTOCOL.
-
+
Arguments:
This - Protocol instance pointer.
ExtendedVerification - Ignored here/
-
+
Returns:
EFI_SUCCESS
@@ -928,17 +928,17 @@ USBMouseRecoveryHandler ( IN VOID *Context
)
/*++
-
+
Routine Description:
Timer handler for Delayed Recovery timer.
-
+
Arguments:
Event - The Delayed Recovery event.
Context - Points to the USB_KB_DEV instance.
-
+
Returns:
-
---*/
+
+--*/
{
USB_MOUSE_DEV *UsbMouseDev;
EFI_USB_IO_PROTOCOL *UsbIo;
diff --git a/EdkModulePkg/Core/Dxe/Dispatcher/Dispatcher.c b/EdkModulePkg/Core/Dxe/Dispatcher/Dispatcher.c index e6e1e6c..9792a16 100644 --- a/EdkModulePkg/Core/Dxe/Dispatcher/Dispatcher.c +++ b/EdkModulePkg/Core/Dxe/Dispatcher/Dispatcher.c @@ -66,7 +66,7 @@ LIST_ENTRY mFvHandleList = INITIALIZE_LIST_HEAD_VARIABLE (mFvHandleList); //
// Lock for mDiscoveredList, mScheduledQueue, gDispatcherRunning.
//
-EFI_LOCK mDispatcherLock = EFI_INITIALIZE_LOCK_VARIABLE (EFI_TPL_HIGH_LEVEL);
+EFI_LOCK mDispatcherLock = EFI_INITIALIZE_LOCK_VARIABLE (TPL_HIGH_LEVEL);
//
@@ -1126,7 +1126,7 @@ Returns: {
mFwVolEvent = CoreCreateProtocolNotifyEvent (
&gEfiFirmwareVolumeProtocolGuid,
- EFI_TPL_CALLBACK,
+ TPL_CALLBACK,
CoreFwVolEventProtocolNotify,
NULL,
&mFwVolEventRegistration,
diff --git a/EdkModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c b/EdkModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c index 8f389d0..5c9a5b8 100644 --- a/EdkModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c +++ b/EdkModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c @@ -216,8 +216,8 @@ Returns: // Create the event
//
Status = CoreCreateEvent (
- EFI_EVENT_NOTIFY_SIGNAL,
- EFI_TPL_CALLBACK,
+ EVT_NOTIFY_SIGNAL,
+ TPL_CALLBACK,
GenericArchProtocolNotify,
NULL,
&Entry->Event
diff --git a/EdkModulePkg/Core/Dxe/Event/event.c b/EdkModulePkg/Core/Dxe/Event/event.c index 8f2934e..b3ba71d 100644 --- a/EdkModulePkg/Core/Dxe/Event/event.c +++ b/EdkModulePkg/Core/Dxe/Event/event.c @@ -30,30 +30,30 @@ UINT32 mEventTable[] = { // 0x80000200 Timer event with a notification function that is
// queue when the event is signaled with SignalEvent()
//
- EFI_EVENT_TIMER | EFI_EVENT_NOTIFY_SIGNAL,
+ EVT_TIMER | EVT_NOTIFY_SIGNAL,
//
// 0x80000000 Timer event without a notification function. It can be
// signaled with SignalEvent() and checked with CheckEvent() or WaitForEvent().
//
- EFI_EVENT_TIMER,
+ EVT_TIMER,
//
// 0x00000100 Generic event with a notification function that
// can be waited on with CheckEvent() or WaitForEvent()
//
- EFI_EVENT_NOTIFY_WAIT,
+ EVT_NOTIFY_WAIT,
//
// 0x00000200 Generic event with a notification function that
// is queue when the event is signaled with SignalEvent()
//
- EFI_EVENT_NOTIFY_SIGNAL,
+ EVT_NOTIFY_SIGNAL,
//
// 0x00000201 ExitBootServicesEvent.
//
- EFI_EVENT_SIGNAL_EXIT_BOOT_SERVICES,
+ EVT_SIGNAL_EXIT_BOOT_SERVICES,
//
// 0x60000202 SetVirtualAddressMapEvent.
//
- EFI_EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,
+ EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,
//
// 0x00000000 Generic event without a notification function.
@@ -65,7 +65,7 @@ UINT32 mEventTable[] = { // 0x80000100 Timer event with a notification function that can be
// waited on with CheckEvent() or WaitForEvent()
//
- EFI_EVENT_TIMER | EFI_EVENT_NOTIFY_WAIT,
+ EVT_TIMER | EVT_NOTIFY_WAIT,
};
STATIC
@@ -139,7 +139,7 @@ Returns: {
UINTN Index;
- for (Index=0; Index <= EFI_TPL_HIGH_LEVEL; Index++) {
+ for (Index=0; Index <= TPL_HIGH_LEVEL; Index++) {
InitializeListHead (&gEventQueue[Index]);
}
@@ -190,7 +190,7 @@ Returns: // Only clear the SIGNAL status if it is a SIGNAL type event.
// WAIT type events are only cleared in CheckEvent()
//
- if (Event->Type & EFI_EVENT_NOTIFY_SIGNAL) {
+ if (Event->Type & EVT_NOTIFY_SIGNAL) {
Event->SignalCount = 0;
}
@@ -332,9 +332,9 @@ Returns: //
// Convert EFI 1.10 Events to thier UEFI 2.0 CreateEventEx mapping
//
- if (Type == EVENT_SIGNAL_EXIT_BOOT_SERVICES) {
+ if (Type == EVT_SIGNAL_EXIT_BOOT_SERVICES) {
GuidPtr = &gEfiEventExitBootServicesGuid;
- } else if (Type == EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE) {
+ } else if (Type == EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE) {
GuidPtr = &gEfiEventVirtualAddressChangeGuid;
}
@@ -378,7 +378,7 @@ Returns: INTN Index;
- if ((Event == NULL) || (NotifyTpl == EFI_TPL_APPLICATION)) {
+ if ((Event == NULL) || (NotifyTpl == TPL_APPLICATION)) {
return EFI_INVALID_PARAMETER;
}
@@ -399,13 +399,13 @@ Returns: //
// If it's a notify type of event, check its parameters
//
- if ((Type & (EFI_EVENT_NOTIFY_WAIT | EFI_EVENT_NOTIFY_SIGNAL))) {
+ if ((Type & (EVT_NOTIFY_WAIT | EVT_NOTIFY_SIGNAL))) {
//
// Check for an invalid NotifyFunction or NotifyTpl
//
if ((NotifyFunction == NULL) ||
- (NotifyTpl < EFI_TPL_APPLICATION) ||
- (NotifyTpl >= EFI_TPL_HIGH_LEVEL)) {
+ (NotifyTpl < TPL_APPLICATION) ||
+ (NotifyTpl >= TPL_HIGH_LEVEL)) {
return EFI_INVALID_PARAMETER;
}
@@ -422,7 +422,7 @@ Returns: // Allcoate and initialize a new event structure.
//
Status = CoreAllocatePool (
- (Type & EFI_EVENT_RUNTIME) ? EfiRuntimeServicesData: EfiBootServicesData,
+ (Type & EVT_RUNTIME) ? EfiRuntimeServicesData: EfiBootServicesData,
sizeof (IEVENT),
(VOID **)&IEvent
);
@@ -445,7 +445,7 @@ Returns: *Event = IEvent;
- if (Type & EFI_EVENT_RUNTIME) {
+ if (Type & EVT_RUNTIME) {
//
// Keep a list of all RT events so we can tell the RT AP.
//
@@ -459,7 +459,7 @@ Returns: CoreAcquireEventLock ();
- if ((Type & EFI_EVENT_NOTIFY_SIGNAL) != 0x00000000) {
+ if ((Type & EVT_NOTIFY_SIGNAL) != 0x00000000) {
//
// The Event's NotifyFunction must be queued whenever the event is signaled
//
@@ -523,7 +523,7 @@ Returns: //
// If signalling type is a notify function, queue it
//
- if (Event->Type & EFI_EVENT_NOTIFY_SIGNAL) {
+ if (Event->Type & EVT_NOTIFY_SIGNAL) {
if (Event->ExFlag) {
//
// The CreateEventEx() style requires all members of the Event Group
@@ -580,13 +580,13 @@ Returns: return EFI_INVALID_PARAMETER;
}
- if (Event->Type & EFI_EVENT_NOTIFY_SIGNAL) {
+ if (Event->Type & EVT_NOTIFY_SIGNAL) {
return EFI_INVALID_PARAMETER;
}
Status = EFI_NOT_READY;
- if (!Event->SignalCount && (Event->Type & EFI_EVENT_NOTIFY_WAIT)) {
+ if (!Event->SignalCount && (Event->Type & EVT_NOTIFY_WAIT)) {
//
// Queue the wait notify function
@@ -654,7 +654,7 @@ Returns: //
// Can only WaitForEvent at TPL_APPLICATION
//
- if (gEfiCurrentTpl != EFI_TPL_APPLICATION) {
+ if (gEfiCurrentTpl != TPL_APPLICATION) {
return EFI_UNSUPPORTED;
}
@@ -721,7 +721,7 @@ Returns: //
// If it's a timer event, make sure it's not pending
//
- if (Event->Type & EFI_EVENT_TIMER) {
+ if (Event->Type & EVT_TIMER) {
CoreSetTimer (Event, TimerCancel, 0);
}
diff --git a/EdkModulePkg/Core/Dxe/Event/execdata.c b/EdkModulePkg/Core/Dxe/Event/execdata.c index 6e9b68b..a6d388a 100644 --- a/EdkModulePkg/Core/Dxe/Event/execdata.c +++ b/EdkModulePkg/Core/Dxe/Event/execdata.c @@ -28,19 +28,19 @@ Revision History //
// gTpl - Task priority level
//
-EFI_TPL gEfiCurrentTpl = EFI_TPL_APPLICATION;
+EFI_TPL gEfiCurrentTpl = TPL_APPLICATION;
//
// gEventQueueLock - Protects the event queus
//
-EFI_LOCK gEventQueueLock = EFI_INITIALIZE_LOCK_VARIABLE (EFI_TPL_HIGH_LEVEL);
+EFI_LOCK gEventQueueLock = EFI_INITIALIZE_LOCK_VARIABLE (TPL_HIGH_LEVEL);
//
// gEventQueue - A list of event's to notify for each priority level
// gEventPending - A bitmask of the EventQueues that are pending
//
-LIST_ENTRY gEventQueue[EFI_TPL_HIGH_LEVEL + 1];
+LIST_ENTRY gEventQueue[TPL_HIGH_LEVEL + 1];
UINTN gEventPending = 0;
diff --git a/EdkModulePkg/Core/Dxe/Event/timer.c b/EdkModulePkg/Core/Dxe/Event/timer.c index a497015..0f886f9 100644 --- a/EdkModulePkg/Core/Dxe/Event/timer.c +++ b/EdkModulePkg/Core/Dxe/Event/timer.c @@ -1,16 +1,16 @@ /*++
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module Name:
-
+
timer.c
Abstract:
@@ -52,10 +52,10 @@ CoreInsertEventTimer ( //
static LIST_ENTRY mEfiTimerList = INITIALIZE_LIST_HEAD_VARIABLE (mEfiTimerList);
-static EFI_LOCK mEfiTimerLock = EFI_INITIALIZE_LOCK_VARIABLE (EFI_TPL_HIGH_LEVEL - 1);
+static EFI_LOCK mEfiTimerLock = EFI_INITIALIZE_LOCK_VARIABLE (TPL_HIGH_LEVEL - 1);
static EFI_EVENT mEfiCheckTimerEvent;
-static EFI_LOCK mEfiSystemTimeLock = EFI_INITIALIZE_LOCK_VARIABLE (EFI_TPL_HIGH_LEVEL);
+static EFI_LOCK mEfiSystemTimeLock = EFI_INITIALIZE_LOCK_VARIABLE (TPL_HIGH_LEVEL);
static UINT64 mEfiSystemTime = 0;
//
@@ -75,7 +75,7 @@ Routine Description: Arguments:
None
-
+
Returns:
None
@@ -85,8 +85,8 @@ Returns: EFI_STATUS Status;
Status = CoreCreateEvent (
- EFI_EVENT_NOTIFY_SIGNAL,
- EFI_TPL_HIGH_LEVEL - 1,
+ EVT_NOTIFY_SIGNAL,
+ TPL_HIGH_LEVEL - 1,
CoreCheckTimers,
NULL,
&mEfiCheckTimerEvent
@@ -108,7 +108,7 @@ Routine Description: Arguments:
None
-
+
Returns:
Returns the current system time
@@ -137,7 +137,7 @@ Routine Description: Arguments:
Duration - The number of 100ns elasped since the last call to TimerTick
-
+
Returns:
None
@@ -331,16 +331,16 @@ Arguments: UserEvent - The timer event that is to be signaled at the specified time
Type - The type of time that is specified in TriggerTime
TriggerTime - The number of 100ns units until the timer expires
-
+
Returns:
EFI_SUCCESS - The event has been set to be signaled at the requested time
EFI_INVALID_PARAMETER - Event or Type is not valid
---*/
+--*/
{
IEVENT *Event;
-
+
Event = UserEvent;
if (Event == NULL) {
@@ -351,10 +351,10 @@ Returns: return EFI_INVALID_PARAMETER;
}
- if (Type < 0 || Type > TimerRelative || !(Event->Type & EFI_EVENT_TIMER)) {
+ if (Type < 0 || Type > TimerRelative || !(Event->Type & EVT_TIMER)) {
return EFI_INVALID_PARAMETER;
}
-
+
CoreAcquireLock (&mEfiTimerLock);
//
diff --git a/EdkModulePkg/Core/Dxe/Event/tpl.c b/EdkModulePkg/Core/Dxe/Event/tpl.c index ae85163..437665f 100644 --- a/EdkModulePkg/Core/Dxe/Event/tpl.c +++ b/EdkModulePkg/Core/Dxe/Event/tpl.c @@ -118,7 +118,7 @@ Returns: //
// If raising to high level, disable interrupts
//
- if (NewTpl >= EFI_TPL_HIGH_LEVEL && OldTpl < EFI_TPL_HIGH_LEVEL) {
+ if (NewTpl >= TPL_HIGH_LEVEL && OldTpl < TPL_HIGH_LEVEL) {
CoreSetInterruptState (FALSE);
}
@@ -165,8 +165,8 @@ Returns: // interrupts are enabled
//
- if (OldTpl >= EFI_TPL_HIGH_LEVEL && NewTpl < EFI_TPL_HIGH_LEVEL) {
- gEfiCurrentTpl = EFI_TPL_HIGH_LEVEL;
+ if (OldTpl >= TPL_HIGH_LEVEL && NewTpl < TPL_HIGH_LEVEL) {
+ gEfiCurrentTpl = TPL_HIGH_LEVEL;
}
//
@@ -175,7 +175,7 @@ Returns: while ((-2 << NewTpl) & gEventPending) {
gEfiCurrentTpl = CoreHighestSetBit (gEventPending);
- if (gEfiCurrentTpl < EFI_TPL_HIGH_LEVEL) {
+ if (gEfiCurrentTpl < TPL_HIGH_LEVEL) {
CoreSetInterruptState (TRUE);
}
CoreDispatchEventNotifies (gEfiCurrentTpl);
@@ -191,7 +191,7 @@ Returns: // If lowering below HIGH_LEVEL, make sure
// interrupts are enabled
//
- if (gEfiCurrentTpl < EFI_TPL_HIGH_LEVEL) {
+ if (gEfiCurrentTpl < TPL_HIGH_LEVEL) {
CoreSetInterruptState (TRUE);
}
diff --git a/EdkModulePkg/Core/Dxe/Exec.h b/EdkModulePkg/Core/Dxe/Exec.h index 376c381..5df7001 100644 --- a/EdkModulePkg/Core/Dxe/Exec.h +++ b/EdkModulePkg/Core/Dxe/Exec.h @@ -22,7 +22,7 @@ Abstract: #ifndef _EXEC_H_
#define _EXEC_H_
-#define VALID_TPL(a) ((a) <= EFI_TPL_HIGH_LEVEL)
+#define VALID_TPL(a) ((a) <= TPL_HIGH_LEVEL)
//
// EFI_EVENT
diff --git a/EdkModulePkg/Core/Dxe/FwVol/FwVol.c b/EdkModulePkg/Core/Dxe/FwVol/FwVol.c index 2e92a8b..a73a125 100644 --- a/EdkModulePkg/Core/Dxe/FwVol/FwVol.c +++ b/EdkModulePkg/Core/Dxe/FwVol/FwVol.c @@ -536,7 +536,7 @@ Returns: {
gEfiFwVolBlockEvent = CoreCreateProtocolNotifyEvent (
&gEfiFirmwareVolumeBlockProtocolGuid,
- EFI_TPL_CALLBACK,
+ TPL_CALLBACK,
NotifyFwVolBlock,
NULL,
&gEfiFwVolBlockNotifyReg,
diff --git a/EdkModulePkg/Core/Dxe/Gcd/gcd.c b/EdkModulePkg/Core/Dxe/Gcd/gcd.c index 181cb1a..be3dbdd 100644 --- a/EdkModulePkg/Core/Dxe/Gcd/gcd.c +++ b/EdkModulePkg/Core/Dxe/Gcd/gcd.c @@ -48,8 +48,8 @@ Abstract: //
// Module Variables
//
-EFI_LOCK mGcdMemorySpaceLock = EFI_INITIALIZE_LOCK_VARIABLE (EFI_TPL_NOTIFY);
-EFI_LOCK mGcdIoSpaceLock = EFI_INITIALIZE_LOCK_VARIABLE (EFI_TPL_NOTIFY);
+EFI_LOCK mGcdMemorySpaceLock = EFI_INITIALIZE_LOCK_VARIABLE (TPL_NOTIFY);
+EFI_LOCK mGcdIoSpaceLock = EFI_INITIALIZE_LOCK_VARIABLE (TPL_NOTIFY);
LIST_ENTRY mGcdMemorySpaceMap = INITIALIZE_LIST_HEAD_VARIABLE (mGcdMemorySpaceMap);
LIST_ENTRY mGcdIoSpaceMap = INITIALIZE_LIST_HEAD_VARIABLE (mGcdIoSpaceMap);
diff --git a/EdkModulePkg/Core/Dxe/Hand/handle.c b/EdkModulePkg/Core/Dxe/Hand/handle.c index dd0801a..42d96ff 100644 --- a/EdkModulePkg/Core/Dxe/Hand/handle.c +++ b/EdkModulePkg/Core/Dxe/Hand/handle.c @@ -34,7 +34,7 @@ Revision History //
static LIST_ENTRY mProtocolDatabase = INITIALIZE_LIST_HEAD_VARIABLE (mProtocolDatabase);
LIST_ENTRY gHandleList = INITIALIZE_LIST_HEAD_VARIABLE (gHandleList);
-EFI_LOCK gProtocolDatabaseLock = EFI_INITIALIZE_LOCK_VARIABLE (EFI_TPL_NOTIFY);
+EFI_LOCK gProtocolDatabaseLock = EFI_INITIALIZE_LOCK_VARIABLE (TPL_NOTIFY);
UINT64 gHandleDatabaseKey = 0;
@@ -632,7 +632,7 @@ Returns: //
// Syncronize with notifcations.
//
- OldTpl = CoreRaiseTpl (EFI_TPL_NOTIFY);
+ OldTpl = CoreRaiseTpl (TPL_NOTIFY);
OldHandle = *Handle;
//
diff --git a/EdkModulePkg/Core/Dxe/Image/Image.c b/EdkModulePkg/Core/Dxe/Image/Image.c index 901182e..daf5fd1 100644 --- a/EdkModulePkg/Core/Dxe/Image/Image.c +++ b/EdkModulePkg/Core/Dxe/Image/Image.c @@ -576,7 +576,7 @@ Returns: SecurityStatus = EFI_SUCCESS;
- ASSERT (gEfiCurrentTpl < EFI_TPL_NOTIFY);
+ ASSERT (gEfiCurrentTpl < TPL_NOTIFY);
ParentImage = NULL;
//
@@ -1224,7 +1224,7 @@ Returns: // Prevent possible reentrance to this function
// for the same ImageHandle
//
- OldTpl = CoreRaiseTpl (EFI_TPL_NOTIFY);
+ OldTpl = CoreRaiseTpl (TPL_NOTIFY);
Image = CoreLoadedImageInfo (ImageHandle);
if (Image == NULL_HANDLE) {
@@ -1317,7 +1317,7 @@ Returns: // Prevent possible reentrance to this function
// for the same ImageHandle
//
- OldTpl = CoreRaiseTpl (EFI_TPL_NOTIFY);
+ OldTpl = CoreRaiseTpl (TPL_NOTIFY);
Image = CoreLoadedImageInfo (ImageHandle);
if (Image == NULL ) {
diff --git a/EdkModulePkg/Core/Dxe/Library/Library.c b/EdkModulePkg/Core/Dxe/Library/Library.c index 74d873e..3d8a312 100644 --- a/EdkModulePkg/Core/Dxe/Library/Library.c +++ b/EdkModulePkg/Core/Dxe/Library/Library.c @@ -1,13 +1,13 @@ /*++
-Copyright (c) 2006, Intel Corporation
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2006, Intel Corporation
+All rights reserved. This program and the accompanying materials
+are licensed and made available under the terms and conditions of the BSD License
+which accompanies this distribution. The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module Name:
@@ -41,16 +41,16 @@ CoreReportProgressCodeSpecific ( Routine Description:
- Report status code of type EFI_PROGRESS_CODE by caller ID gEfiDxeServicesTableGuid,
+ Report status code of type EFI_PROGRESS_CODE by caller ID gEfiDxeServicesTableGuid,
with a handle as additional information.
-
+
Arguments:
- Value - Describes the class/subclass/operation of the hardware or software entity
- that the Status Code relates to.
-
+ Value - Describes the class/subclass/operation of the hardware or software entity
+ that the Status Code relates to.
+
Handle - Additional information.
-
+
Returns:
None
@@ -80,12 +80,12 @@ CoreReportProgressCode ( Routine Description:
Report status code of type EFI_PROGRESS_CODE by caller ID gEfiDxeServicesTableGuid.
-
+
Arguments:
- Value - Describes the class/subclass/operation of the hardware or software entity
- that the Status Code relates to.
-
+ Value - Describes the class/subclass/operation of the hardware or software entity
+ that the Status Code relates to.
+
Returns:
None
@@ -113,11 +113,11 @@ CoreAllocateBootServicesPool ( Routine Description:
Allocate pool of type EfiBootServicesData, the size is specified with AllocationSize.
-
+
Arguments:
AllocationSize - Size to allocate.
-
+
Returns:
Pointer of the allocated pool.
@@ -140,11 +140,11 @@ CoreAllocateZeroBootServicesPool ( Routine Description:
Allocate pool of type EfiBootServicesData and zero it, the size is specified with AllocationSize.
-
+
Arguments:
AllocationSize - Size to allocate.
-
+
Returns:
Pointer of the allocated pool.
@@ -169,13 +169,13 @@ CoreAllocateCopyPool ( Routine Description:
Allocate pool of specified size with EfiBootServicesData type, and copy specified buffer to this pool.
-
+
Arguments:
AllocationSize - Size to allocate.
-
+
Buffer - Specified buffer that will be copy to the allocated pool
-
+
Returns:
Pointer of the allocated pool.
@@ -186,11 +186,11 @@ Returns: Memory = CoreAllocateBootServicesPool (AllocationSize);
CopyMem (Memory, Buffer, (Memory == NULL) ? 0 : AllocationSize);
-
+
return Memory;
}
-
+
VOID *
CoreAllocateRuntimePool (
@@ -201,11 +201,11 @@ CoreAllocateRuntimePool ( Routine Description:
Allocate pool of type EfiRuntimeServicesData, the size is specified with AllocationSize.
-
+
Arguments:
AllocationSize - Size to allocate.
-
+
Returns:
Pointer of the allocated pool.
@@ -228,13 +228,13 @@ CoreAllocateRuntimeCopyPool ( Routine Description:
Allocate pool of specified size with EfiRuntimeServicesData type, and copy specified buffer to this pool.
-
+
Arguments:
AllocationSize - Size to allocate.
-
+
Buffer - Specified buffer that will be copy to the allocated pool
-
+
Returns:
Pointer of the allocated pool.
@@ -246,7 +246,7 @@ Returns: Memory = CoreAllocateRuntimePool (AllocationSize);
CopyMem (Memory, Buffer, (Memory == NULL) ? 0 : AllocationSize);
-
+
return Memory;
}
@@ -271,11 +271,11 @@ Routine Description: level. Since there is no-premption (at any TPL) or
multiprocessor support, acquiring the lock only consists
of raising to the locks TPL.
-
+
Arguments:
Lock - The EFI_LOCK structure to initialize
-
+
Returns:
EFI_SUCCESS - Lock Owned.
@@ -310,11 +310,11 @@ Routine Description: Raising to the task priority level of the mutual exclusion
lock, and then acquires ownership of the lock.
-
+
Arguments:
Lock - The lock to acquire
-
+
Returns:
Lock owned
@@ -339,11 +339,11 @@ Routine Description: Releases ownership of the mutual exclusion lock, and
restores the previous task priority level.
-
+
Arguments:
Lock - The lock to release
-
+
Returns:
Lock unowned
@@ -356,7 +356,7 @@ Returns: ASSERT (Lock->Lock == EfiLockAcquired);
Tpl = Lock->OwnerTpl;
-
+
Lock->Lock = EfiLockReleased;
CoreRestoreTpl (Tpl);
@@ -371,12 +371,12 @@ CoreDevicePathSize ( Routine Description:
- Calculate the size of a whole device path.
-
+ Calculate the size of a whole device path.
+
Arguments:
DevicePath - The pointer to the device path data.
-
+
Returns:
Size of device path data structure..
@@ -513,7 +513,7 @@ Returns: if (Src1 == NULL && Src2 == NULL) {
return NULL;
}
-
+
//
// Allocate space for the combined device path. It only has one end node of
// length EFI_DEVICE_PATH_PROTOCOL
@@ -564,7 +564,7 @@ Arguments: Registration - Registration key returned from RegisterProtocolNotify().
- SignalFlag - Boolean value to decide whether kick the event after register or not.
+ SignalFlag - Boolean value to decide whether kick the event after register or not.
Returns:
@@ -581,11 +581,11 @@ Returns: //
Status = CoreCreateEvent (
- EFI_EVENT_NOTIFY_SIGNAL,
+ EVT_NOTIFY_SIGNAL,
NotifyTpl,
NotifyFunction,
NotifyContext,
- &Event
+ &Event
);
ASSERT_EFI_ERROR (Status);
diff --git a/EdkModulePkg/Core/Dxe/Mem/memdata.c b/EdkModulePkg/Core/Dxe/Mem/memdata.c index 2fa4843..83a130d 100644 --- a/EdkModulePkg/Core/Dxe/Mem/memdata.c +++ b/EdkModulePkg/Core/Dxe/Mem/memdata.c @@ -28,7 +28,7 @@ Revision History //
// MemoryLock - synchronizes access to the memory map and pool lists
//
-EFI_LOCK gMemoryLock = EFI_INITIALIZE_LOCK_VARIABLE (EFI_TPL_NOTIFY);
+EFI_LOCK gMemoryLock = EFI_INITIALIZE_LOCK_VARIABLE (TPL_NOTIFY);
//
// MemoryMap - the current memory map
diff --git a/EdkModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c b/EdkModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c index a3e20e6..817dbd8 100644 --- a/EdkModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c +++ b/EdkModulePkg/Core/Dxe/SectionExtraction/CoreSectionExtraction.c @@ -383,7 +383,7 @@ Returns: UINTN SectionSize;
- OldTpl = CoreRaiseTpl (EFI_TPL_NOTIFY);
+ OldTpl = CoreRaiseTpl (TPL_NOTIFY);
Instance = SectionInstance + 1;
//
@@ -484,7 +484,7 @@ Returns: LIST_ENTRY *Link;
CORE_SECTION_CHILD_NODE *ChildNode;
- OldTpl = CoreRaiseTpl (EFI_TPL_NOTIFY);
+ OldTpl = CoreRaiseTpl (TPL_NOTIFY);
//
// Locate target stream
@@ -1025,7 +1025,7 @@ Returns: Context->Event = CoreCreateProtocolNotifyEvent (
Context->ChildNode->EncapsulationGuid,
- EFI_TPL_NOTIFY,
+ TPL_NOTIFY,
NotifyGuidedExtraction,
Context,
&Context->Registration,
@@ -1234,7 +1234,7 @@ OpenSectionStreamEx ( //
// Add new stream to stream list
//
- OldTpl = CoreRaiseTpl (EFI_TPL_NOTIFY);
+ OldTpl = CoreRaiseTpl (TPL_NOTIFY);
InsertTailList (&mStreamRoot, &NewStream->Link);
CoreRestoreTpl (OldTpl);
diff --git a/EdkModulePkg/Library/EdkFvbServiceLib/Ia32/Fvb.c b/EdkModulePkg/Library/EdkFvbServiceLib/Ia32/Fvb.c index c94c824..12a55c9 100644 --- a/EdkModulePkg/Library/EdkFvbServiceLib/Ia32/Fvb.c +++ b/EdkModulePkg/Library/EdkFvbServiceLib/Ia32/Fvb.c @@ -2,21 +2,21 @@ Firmware Volume Block Protocol Runtime Abstraction
- mFvbEntry is an array of Handle Fvb pairs. The Fvb Lib Instance matches the
+ mFvbEntry is an array of Handle Fvb pairs. The Fvb Lib Instance matches the
index in the mFvbEntry array. This should be the same sequence as the FVB's
- were described in the HOB. We have to remember the handle so we can tell if
+ were described in the HOB. We have to remember the handle so we can tell if
the protocol has been reinstalled and it needs updateing.
If you are using any of these lib functions.you must first call FvbInitialize ().
-
-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.
**/
@@ -32,9 +32,9 @@ STATIC UINTN mFvbCount; /**
Check whether an address is runtime memory or not.
-
+
@param Address The Address being checked.
-
+
@retval TRUE The address is runtime memory.
@retval FALSE The address is not runtime memory.
**/
@@ -124,10 +124,10 @@ IsRuntimeMemory ( /**
Update mFvbEntry. Add new entry, or update existing entry if Fvb protocol is
reinstalled.
-
+
@param Event The Event that is being processed
@param Context Event Context
-
+
**/
STATIC
VOID
@@ -190,15 +190,15 @@ FvbNotificationEvent ( // Get the interface pointer and if it's ours, skip it
//
Status = gBS->HandleProtocol (
- Handle,
- &gEfiFirmwareVolumeBlockProtocolGuid,
+ Handle,
+ &gEfiFirmwareVolumeBlockProtocolGuid,
(VOID **) &mFvbEntry[UpdateIndex].Fvb
);
ASSERT_EFI_ERROR (Status);
Status = gBS->HandleProtocol (
- Handle,
- &gEfiFvbExtensionProtocolGuid,
+ Handle,
+ &gEfiFvbExtensionProtocolGuid,
(VOID **) &mFvbEntry[UpdateIndex].FvbExtension
);
if (Status != EFI_SUCCESS) {
@@ -209,14 +209,14 @@ FvbNotificationEvent ( // Check the FVB can be accessed in RUNTIME, The FVBs in FVB handle list comes
// from two way:
// 1) Dxe Core. (FVB information is transferred from FV HOB).
- // 2) FVB driver.
+ // 2) FVB driver.
// The FVB produced Dxe core is used for discoverying DXE driver and dispatch. These
- // FVBs can only be accessed in boot time.
+ // FVBs can only be accessed in boot time.
// FVB driver will discovery all FV in FLASH and these FVBs can be accessed in runtime.
- // The FVB itself produced by FVB driver is allocated in runtime memory. So we can
+ // The FVB itself produced by FVB driver is allocated in runtime memory. So we can
// determine the what FVB can be accessed in RUNTIME by judging whether FVB itself is allocated
// in RUNTIME memory.
- //
+ //
mFvbEntry[UpdateIndex].IsRuntimeAccess = IsRuntimeMemory (mFvbEntry[UpdateIndex].Fvb);
}
}
@@ -226,7 +226,7 @@ FvbNotificationEvent ( @param Event The Event that is being processed
@param Context Event Context
-
+
**/
VOID
EFIAPI
@@ -265,10 +265,10 @@ FvbVirtualAddressChangeNotifyEvent ( /**
Library constructor function entry.
-
+
@param ImageHandle The handle of image who call this libary.
@param SystemTable The point of System Table.
-
+
@retval EFI_SUCESS Sucess construct this library.
@retval Others Fail to contruct this libary.
**/
@@ -296,7 +296,7 @@ FvbLibInitialize ( EfiCreateProtocolNotifyEvent (
&gEfiFirmwareVolumeBlockProtocolGuid,
- EFI_TPL_CALLBACK,
+ TPL_CALLBACK,
FvbNotificationEvent,
NULL,
&mFvbRegistration
@@ -306,8 +306,8 @@ FvbLibInitialize ( // Register SetVirtualAddressMap () notify function
//
// Status = gBS->CreateEvent (
- // EFI_EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,
- // EFI_TPL_NOTIFY,
+ // EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,
+ // TPL_NOTIFY,
// EfiRuntimeLibFvbVirtualNotifyEvent,
// NULL,
// &mEfiFvbVirtualNotifyEvent
@@ -326,7 +326,7 @@ FvbLibInitialize ( return EFI_SUCCESS;
}
-//
+//
// =============================================================================
// The following functions wrap Fvb protocol in the Runtime Lib functions.
// The Instance translates into Fvb instance. The Fvb order defined by HOBs and
@@ -335,7 +335,7 @@ FvbLibInitialize ( // EfiFvbInitialize () must be called before any of the following functions
// must be called.
// =============================================================================
-//
+//
/**
Reads specified number of bytes into a buffer from the specified block
@@ -348,7 +348,7 @@ FvbLibInitialize ( of bytes read
@param Buffer Pointer to a caller allocated buffer that will be
used to hold the data read
-
+
@retval EFI_INVALID_PARAMETER Invalid parameter
@retval EFI_SUCESS Sucess to Read block
@retval Others Fail to read block
@@ -375,7 +375,7 @@ EfiFvbReadBlock ( /**
Writes specified number of bytes from the input buffer to the block
-
+
@param Instance The FV instance to be written to
@param Lba The starting logical block index to write to
@param Offset Offset into the block at which to begin writing
@@ -384,7 +384,7 @@ EfiFvbReadBlock ( of bytes actually written
@param Buffer Pointer to a caller allocated buffer that contains
the source for the write
-
+
@retval EFI_INVALID_PARAMETER Invalid parameter
@retval EFI_SUCESS Sucess to write block
@retval Others Fail to write block
@@ -414,7 +414,7 @@ EfiFvbWriteBlock ( @param Instance The FV instance to be erased
@param Lba The logical block index to be erased
-
+
@retval EFI_INVALID_PARAMETER Invalid parameter
@retval EFI_SUCESS Sucess to erase block
@retval Others Fail to erase block
@@ -439,10 +439,10 @@ EfiFvbEraseBlock ( /**
Retrieves attributes, insures positive polarity of attribute bits, returns
resulting attributes in output parameter
-
+
@param Instance The FV instance whose attributes is going to be returned
@param Attributes Output buffer which contains attributes
-
+
@retval EFI_INVALID_PARAMETER Invalid parameter
@retval EFI_SUCESS Sucess to get Fv attribute
@retval Others Fail to get Fv attribute
@@ -465,16 +465,16 @@ EfiFvbGetVolumeAttributes ( }
/**
- Modifies the current settings of the firmware volume according to the
+ Modifies the current settings of the firmware volume according to the
input parameter, and returns the new setting of the volume
- @param Instance The FV instance whose attributes is going to be
+ @param Instance The FV instance whose attributes is going to be
modified
- @param Attributes On input, it is a pointer to EFI_FVB_ATTRIBUTES
+ @param Attributes On input, it is a pointer to EFI_FVB_ATTRIBUTES
containing the desired firmware volume settings.
On successful return, it contains the new settings
of the firmware volume
-
+
@retval EFI_INVALID_PARAMETER Invalid parameter
@retval EFI_SUCESS Sucess to set Fv attribute
@retval Others Fail to set Fv attribute
@@ -501,10 +501,10 @@ EfiFvbSetVolumeAttributes ( @param Instance The FV instance whose base address is going to be
returned
- @param BaseAddress Pointer to a caller allocated EFI_PHYSICAL_ADDRESS
+ @param BaseAddress Pointer to a caller allocated EFI_PHYSICAL_ADDRESS
that on successful return, contains the base address
of the firmware volume.
-
+
@retval EFI_INVALID_PARAMETER Invalid parameter
@retval EFI_SUCESS Sucess to get physical address
@retval Others Fail to get physical address
@@ -538,7 +538,7 @@ EfiFvbGetPhysicalAddress ( number of consecutive blocks starting with Lba is
returned. All blocks in this range have a size of
BlockSize
-
+
@retval EFI_INVALID_PARAMETER Invalid parameter
@retval EFI_SUCESS Sucess to get block size
@retval Others Fail to get block size
@@ -567,11 +567,11 @@ EfiFvbGetBlockSize ( @param Instance The FV instance to be erased
@param StartLba The starting logical block index to be erased
- @param OffsetStartLba Offset into the starting block at which to
+ @param OffsetStartLba Offset into the starting block at which to
begin erasing
@param LastLba The last logical block index to be erased
@param OffsetLastLba Offset into the last block at which to end erasing
-
+
@retval EFI_INVALID_PARAMETER Invalid parameter
@retval EFI_SUCESS Sucess to erase custom block range
@retval Others Fail to erase custom block range
diff --git a/EdkModulePkg/Library/EdkFvbServiceLib/x64/Fvb.c b/EdkModulePkg/Library/EdkFvbServiceLib/x64/Fvb.c index c94c824..12a55c9 100644 --- a/EdkModulePkg/Library/EdkFvbServiceLib/x64/Fvb.c +++ b/EdkModulePkg/Library/EdkFvbServiceLib/x64/Fvb.c @@ -2,21 +2,21 @@ Firmware Volume Block Protocol Runtime Abstraction
- mFvbEntry is an array of Handle Fvb pairs. The Fvb Lib Instance matches the
+ mFvbEntry is an array of Handle Fvb pairs. The Fvb Lib Instance matches the
index in the mFvbEntry array. This should be the same sequence as the FVB's
- were described in the HOB. We have to remember the handle so we can tell if
+ were described in the HOB. We have to remember the handle so we can tell if
the protocol has been reinstalled and it needs updateing.
If you are using any of these lib functions.you must first call FvbInitialize ().
-
-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.
**/
@@ -32,9 +32,9 @@ STATIC UINTN mFvbCount; /**
Check whether an address is runtime memory or not.
-
+
@param Address The Address being checked.
-
+
@retval TRUE The address is runtime memory.
@retval FALSE The address is not runtime memory.
**/
@@ -124,10 +124,10 @@ IsRuntimeMemory ( /**
Update mFvbEntry. Add new entry, or update existing entry if Fvb protocol is
reinstalled.
-
+
@param Event The Event that is being processed
@param Context Event Context
-
+
**/
STATIC
VOID
@@ -190,15 +190,15 @@ FvbNotificationEvent ( // Get the interface pointer and if it's ours, skip it
//
Status = gBS->HandleProtocol (
- Handle,
- &gEfiFirmwareVolumeBlockProtocolGuid,
+ Handle,
+ &gEfiFirmwareVolumeBlockProtocolGuid,
(VOID **) &mFvbEntry[UpdateIndex].Fvb
);
ASSERT_EFI_ERROR (Status);
Status = gBS->HandleProtocol (
- Handle,
- &gEfiFvbExtensionProtocolGuid,
+ Handle,
+ &gEfiFvbExtensionProtocolGuid,
(VOID **) &mFvbEntry[UpdateIndex].FvbExtension
);
if (Status != EFI_SUCCESS) {
@@ -209,14 +209,14 @@ FvbNotificationEvent ( // Check the FVB can be accessed in RUNTIME, The FVBs in FVB handle list comes
// from two way:
// 1) Dxe Core. (FVB information is transferred from FV HOB).
- // 2) FVB driver.
+ // 2) FVB driver.
// The FVB produced Dxe core is used for discoverying DXE driver and dispatch. These
- // FVBs can only be accessed in boot time.
+ // FVBs can only be accessed in boot time.
// FVB driver will discovery all FV in FLASH and these FVBs can be accessed in runtime.
- // The FVB itself produced by FVB driver is allocated in runtime memory. So we can
+ // The FVB itself produced by FVB driver is allocated in runtime memory. So we can
// determine the what FVB can be accessed in RUNTIME by judging whether FVB itself is allocated
// in RUNTIME memory.
- //
+ //
mFvbEntry[UpdateIndex].IsRuntimeAccess = IsRuntimeMemory (mFvbEntry[UpdateIndex].Fvb);
}
}
@@ -226,7 +226,7 @@ FvbNotificationEvent ( @param Event The Event that is being processed
@param Context Event Context
-
+
**/
VOID
EFIAPI
@@ -265,10 +265,10 @@ FvbVirtualAddressChangeNotifyEvent ( /**
Library constructor function entry.
-
+
@param ImageHandle The handle of image who call this libary.
@param SystemTable The point of System Table.
-
+
@retval EFI_SUCESS Sucess construct this library.
@retval Others Fail to contruct this libary.
**/
@@ -296,7 +296,7 @@ FvbLibInitialize ( EfiCreateProtocolNotifyEvent (
&gEfiFirmwareVolumeBlockProtocolGuid,
- EFI_TPL_CALLBACK,
+ TPL_CALLBACK,
FvbNotificationEvent,
NULL,
&mFvbRegistration
@@ -306,8 +306,8 @@ FvbLibInitialize ( // Register SetVirtualAddressMap () notify function
//
// Status = gBS->CreateEvent (
- // EFI_EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,
- // EFI_TPL_NOTIFY,
+ // EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,
+ // TPL_NOTIFY,
// EfiRuntimeLibFvbVirtualNotifyEvent,
// NULL,
// &mEfiFvbVirtualNotifyEvent
@@ -326,7 +326,7 @@ FvbLibInitialize ( return EFI_SUCCESS;
}
-//
+//
// =============================================================================
// The following functions wrap Fvb protocol in the Runtime Lib functions.
// The Instance translates into Fvb instance. The Fvb order defined by HOBs and
@@ -335,7 +335,7 @@ FvbLibInitialize ( // EfiFvbInitialize () must be called before any of the following functions
// must be called.
// =============================================================================
-//
+//
/**
Reads specified number of bytes into a buffer from the specified block
@@ -348,7 +348,7 @@ FvbLibInitialize ( of bytes read
@param Buffer Pointer to a caller allocated buffer that will be
used to hold the data read
-
+
@retval EFI_INVALID_PARAMETER Invalid parameter
@retval EFI_SUCESS Sucess to Read block
@retval Others Fail to read block
@@ -375,7 +375,7 @@ EfiFvbReadBlock ( /**
Writes specified number of bytes from the input buffer to the block
-
+
@param Instance The FV instance to be written to
@param Lba The starting logical block index to write to
@param Offset Offset into the block at which to begin writing
@@ -384,7 +384,7 @@ EfiFvbReadBlock ( of bytes actually written
@param Buffer Pointer to a caller allocated buffer that contains
the source for the write
-
+
@retval EFI_INVALID_PARAMETER Invalid parameter
@retval EFI_SUCESS Sucess to write block
@retval Others Fail to write block
@@ -414,7 +414,7 @@ EfiFvbWriteBlock ( @param Instance The FV instance to be erased
@param Lba The logical block index to be erased
-
+
@retval EFI_INVALID_PARAMETER Invalid parameter
@retval EFI_SUCESS Sucess to erase block
@retval Others Fail to erase block
@@ -439,10 +439,10 @@ EfiFvbEraseBlock ( /**
Retrieves attributes, insures positive polarity of attribute bits, returns
resulting attributes in output parameter
-
+
@param Instance The FV instance whose attributes is going to be returned
@param Attributes Output buffer which contains attributes
-
+
@retval EFI_INVALID_PARAMETER Invalid parameter
@retval EFI_SUCESS Sucess to get Fv attribute
@retval Others Fail to get Fv attribute
@@ -465,16 +465,16 @@ EfiFvbGetVolumeAttributes ( }
/**
- Modifies the current settings of the firmware volume according to the
+ Modifies the current settings of the firmware volume according to the
input parameter, and returns the new setting of the volume
- @param Instance The FV instance whose attributes is going to be
+ @param Instance The FV instance whose attributes is going to be
modified
- @param Attributes On input, it is a pointer to EFI_FVB_ATTRIBUTES
+ @param Attributes On input, it is a pointer to EFI_FVB_ATTRIBUTES
containing the desired firmware volume settings.
On successful return, it contains the new settings
of the firmware volume
-
+
@retval EFI_INVALID_PARAMETER Invalid parameter
@retval EFI_SUCESS Sucess to set Fv attribute
@retval Others Fail to set Fv attribute
@@ -501,10 +501,10 @@ EfiFvbSetVolumeAttributes ( @param Instance The FV instance whose base address is going to be
returned
- @param BaseAddress Pointer to a caller allocated EFI_PHYSICAL_ADDRESS
+ @param BaseAddress Pointer to a caller allocated EFI_PHYSICAL_ADDRESS
that on successful return, contains the base address
of the firmware volume.
-
+
@retval EFI_INVALID_PARAMETER Invalid parameter
@retval EFI_SUCESS Sucess to get physical address
@retval Others Fail to get physical address
@@ -538,7 +538,7 @@ EfiFvbGetPhysicalAddress ( number of consecutive blocks starting with Lba is
returned. All blocks in this range have a size of
BlockSize
-
+
@retval EFI_INVALID_PARAMETER Invalid parameter
@retval EFI_SUCESS Sucess to get block size
@retval Others Fail to get block size
@@ -567,11 +567,11 @@ EfiFvbGetBlockSize ( @param Instance The FV instance to be erased
@param StartLba The starting logical block index to be erased
- @param OffsetStartLba Offset into the starting block at which to
+ @param OffsetStartLba Offset into the starting block at which to
begin erasing
@param LastLba The last logical block index to be erased
@param OffsetLastLba Offset into the last block at which to end erasing
-
+
@retval EFI_INVALID_PARAMETER Invalid parameter
@retval EFI_SUCESS Sucess to erase custom block range
@retval Others Fail to erase custom block range
diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/Common/RuntimeLib.c b/EdkModulePkg/Library/EdkUefiRuntimeLib/Common/RuntimeLib.c index ce4efff..3cb11d8 100644 --- a/EdkModulePkg/Library/EdkUefiRuntimeLib/Common/RuntimeLib.c +++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/Common/RuntimeLib.c @@ -1,14 +1,14 @@ /**@file
Library utility functions for Runtime driver.
-
+
Copyright (c) 2006 Intel Corporation. <BR>
-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.
+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.
**/
@@ -25,7 +25,7 @@ EFI_RUNTIME_SERVICES *mRT; /**
Set AtRuntime flag as TRUE after ExitBootServices
-
+
@param[in] Event The Event that is being processed
@param[in] Context Event Context
**/
@@ -46,9 +46,9 @@ RuntimeDriverExitBootServices ( /**
Fixup internal data so that EFI can be call in virtual mode.
- Call the passed in Child Notify event and convert any pointers in
+ Call the passed in Child Notify event and convert any pointers in
lib to virtual mode.
-
+
@param[in] Event The Event that is being processed
@param[in] Context Event Context
**/
@@ -63,7 +63,7 @@ RuntimeLibVirtualNotifyEvent ( UINTN Index;
EFI_EVENT_NOTIFY ChildNotifyEventHandler;
- for (Index = 0;
+ for (Index = 0;
_gDriverSetVirtualAddressMapEvent[Index] != NULL;
Index++) {
ChildNotifyEventHandler = _gDriverSetVirtualAddressMapEvent[Index];
@@ -79,11 +79,11 @@ RuntimeLibVirtualNotifyEvent ( }
/**
- Intialize runtime Driver Lib if it has not yet been initialized.
-
+ Intialize runtime Driver Lib if it has not yet been initialized.
+
@param[in] ImageHandle The firmware allocated handle for the EFI image.
@param[in] SystemTable A pointer to the EFI System Table.
-
+
@return EFI_STATUS always returns EFI_SUCCESS except EFI_ALREADY_STARTED if already started.
**/
EFI_STATUS
@@ -101,11 +101,11 @@ RuntimeDriverLibConstruct ( //
// Register SetVirtualAddressMap () notify function
- //
+ //
ASSERT (gBS != NULL);
Status = gBS->CreateEvent (
- EFI_EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,
- EFI_TPL_NOTIFY,
+ EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,
+ TPL_NOTIFY,
RuntimeLibVirtualNotifyEvent,
NULL,
&mEfiVirtualNotifyEvent
@@ -118,7 +118,7 @@ RuntimeDriverLibConstruct ( /**
This routine will free some resources which have been allocated in
- EfiInitializeRuntimeDriverLib(). If a runtime driver exits with an error,
+ EfiInitializeRuntimeDriverLib(). If a runtime driver exits with an error,
it must call this routine to free the allocated resource before the exiting.
@retval EFI_SUCCESS Shutdown the Runtime Driver Lib successfully
@@ -139,13 +139,13 @@ RuntimeDriverLibDeconstruct ( ASSERT (gBS != NULL);
Status = gBS->CloseEvent (mEfiVirtualNotifyEvent);
ASSERT_EFI_ERROR (Status);
-
+
return Status;
}
/**
Return TRUE if ExitBootServices () has been called
-
+
@retval TRUE If ExitBootServices () has been called
**/
BOOLEAN
@@ -159,7 +159,7 @@ EfiAtRuntime ( /**
Return TRUE if SetVirtualAddressMap () has been called
-
+
@retval TRUE If SetVirtualAddressMap () has been called
**/
BOOLEAN
diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c index f6a1904..71a7bf9 100644 --- a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c +++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.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:
@@ -38,10 +38,10 @@ Routine Description: Arguments:
Event - The Event that is being processed
-
+
Context - Event Context
-Returns:
+Returns:
None
@@ -64,16 +64,16 @@ RuntimeLibVirtualNotifyEvent ( Routine Description:
Fixup internal data so that EFI can be call in virtual mode.
- Call the passed in Child Notify event and convert any pointers in
+ Call the passed in Child Notify event and convert any pointers in
lib to virtual mode.
Arguments:
Event - The Event that is being processed
-
+
Context - Event Context
-Returns:
+Returns:
None
@@ -103,12 +103,12 @@ RuntimeDriverLibConstruct ( Routine Description:
- Intialize runtime Driver Lib if it has not yet been initialized.
+ Intialize runtime Driver Lib if it has not yet been initialized.
Arguments:
ImageHandle - The firmware allocated handle for the EFI image.
-
+
SystemTable - A pointer to the EFI System Table.
GoVirtualChildEvent - Caller can register a virtual notification event.
@@ -128,8 +128,8 @@ Returns: //
if (_gDriverSetVirtualAddressMapEvent[0] != NULL) {
Status = gBS->CreateEvent (
- EFI_EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,
- EFI_TPL_NOTIFY,
+ EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE,
+ TPL_NOTIFY,
RuntimeLibVirtualNotifyEvent,
NULL,
&mEfiVirtualNotifyEvent
@@ -151,14 +151,14 @@ RuntimeDriverLibDeconstruct ( Routine Description:
This routine will free some resources which have been allocated in
- EfiInitializeRuntimeDriverLib(). If a runtime driver exits with an error,
+ EfiInitializeRuntimeDriverLib(). If a runtime driver exits with an error,
it must call this routine to free the allocated resource before the exiting.
Arguments:
None
-Returns:
+Returns:
EFI_SUCCESS - Shotdown the Runtime Driver Lib successfully
EFI_UNSUPPORTED - Runtime Driver lib was not initialized at all
@@ -191,7 +191,7 @@ Routine Description: Arguments:
NONE
-Returns:
+Returns:
TRUE - If ExitBootService () has been called
--*/
@@ -220,7 +220,7 @@ Routine Description: Arguments:
NONE
-Returns:
+Returns:
TRUE - If SetVirtualAddressMap () has been called
--*/
diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c index bd18e25..30ee71f 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 9de82cc..21cf9db 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 ba113c2..958516d 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 dd4a5a6..aa0cced 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 1a392ab..ac703fd 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 ca2a1e8..33233d6 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 b42ff17..2b647d9 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 741116a..f56cf04 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 da76b55..31efab3 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 2516902..0eceddf 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 b7edbe6..747d243 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 a1f4715..b557f4c 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 83ca20b..22dcf25 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 941076a..e2afbff 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 85bb8bb..20ae95d 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 503d5a6..b6667ca 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 2821e65..6f6ac81 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 80e6033..9e0ecca 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 a32812a..4b8d6f8 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 2fd9cab..01a26bb 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 17cafea..f8c4cb0 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 85e552b..72d699d 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 a9dff1d..ed9fd59 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 40bd826..3d30c1b 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 589217a..79c23ce 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 2f88667..e38def3 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
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;
diff --git a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSubclassDriverEntryPoint.c b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSubclassDriverEntryPoint.c index 910564d..0feb137 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 0167220..2ddc9e5 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 0a7503f..3167949 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 e3fd034..9f550f2 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 b8030ed..58cfefb 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 babfa4b..9158a45 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 85c23f0..10efc5e 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 37fdde5..652594d 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 af27d7b..af20756 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 fad36f8..7cb85a6 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;
diff --git a/IntelFrameworkPkg/Library/UefiLibFramework/UefiLib.c b/IntelFrameworkPkg/Library/UefiLibFramework/UefiLib.c index 732ac6c..9dd79af 100644 --- a/IntelFrameworkPkg/Library/UefiLibFramework/UefiLib.c +++ b/IntelFrameworkPkg/Library/UefiLibFramework/UefiLib.c @@ -113,7 +113,7 @@ EfiCreateProtocolNotifyEvent( //
Status = gBS->CreateEvent (
- EFI_EVENT_NOTIFY_SIGNAL,
+ EVT_NOTIFY_SIGNAL,
NotifyTpl,
NotifyFunction,
NotifyContext,
@@ -175,7 +175,7 @@ EfiNamedEventListen ( // Create event
//
Status = gBS->CreateEvent (
- EFI_EVENT_NOTIFY_SIGNAL,
+ EVT_NOTIFY_SIGNAL,
NotifyTpl,
NotifyFunction,
(VOID *) NotifyContext,
@@ -267,7 +267,7 @@ EfiGetCurrentTpl ( {
EFI_TPL Tpl;
- Tpl = gBS->RaiseTPL (EFI_TPL_HIGH_LEVEL);
+ Tpl = gBS->RaiseTPL (TPL_HIGH_LEVEL);
gBS->RestoreTPL (Tpl);
return Tpl;
@@ -294,10 +294,10 @@ EfiInitializeLock ( )
{
ASSERT (Lock != NULL);
- ASSERT (Priority <= EFI_TPL_HIGH_LEVEL);
+ ASSERT (Priority <= TPL_HIGH_LEVEL);
Lock->Tpl = Priority;
- Lock->OwnerTpl = EFI_TPL_APPLICATION;
+ Lock->OwnerTpl = TPL_APPLICATION;
Lock->Lock = EfiLockReleased ;
return Lock;
}
diff --git a/IntelFrameworkPkg/Library/UefiLibFramework/UefiNotTiano.c b/IntelFrameworkPkg/Library/UefiLibFramework/UefiNotTiano.c index 3553993..ee679e6 100644 --- a/IntelFrameworkPkg/Library/UefiLibFramework/UefiNotTiano.c +++ b/IntelFrameworkPkg/Library/UefiLibFramework/UefiNotTiano.c @@ -60,7 +60,7 @@ EfiCreateEventLegacyBoot ( )
{
return EfiCreateEventLegacyBootEx (
- EFI_TPL_CALLBACK,
+ TPL_CALLBACK,
InternalEmptyFuntion,
NULL,
LegacyBootEvent
@@ -104,7 +104,7 @@ EfiCreateEventLegacyBootEx ( // prior to UEFI 2.0 use Tiano extension to EFI
//
Status = gBS->CreateEvent (
- EFI_EVENT_SIGNAL_LEGACY_BOOT | EFI_EVENT_NOTIFY_SIGNAL_ALL,
+ EFI_EVENT_SIGNAL_LEGACY_BOOT | EVT_NOTIFY_SIGNAL,
NotifyTpl,
NotifyFunction,
NotifyContext,
@@ -115,7 +115,7 @@ EfiCreateEventLegacyBootEx ( // For UEFI 2.0 and the future use an Event Group
//
Status = gBS->CreateEventEx (
- EVENT_NOTIFY_SIGNAL,
+ EVT_NOTIFY_SIGNAL,
NotifyTpl,
NotifyFunction,
NotifyContext,
@@ -150,7 +150,7 @@ EfiCreateEventReadyToBoot ( )
{
return EfiCreateEventReadyToBootEx (
- EFI_TPL_CALLBACK,
+ TPL_CALLBACK,
InternalEmptyFuntion,
NULL,
ReadyToBootEvent
@@ -205,7 +205,7 @@ EfiCreateEventReadyToBootEx ( // For UEFI 2.0 and the future use an Event Group
//
Status = gBS->CreateEventEx (
- EVENT_NOTIFY_SIGNAL,
+ EVT_NOTIFY_SIGNAL,
NotifyTpl,
NotifyFunction,
NotifyContext,
diff --git a/OldMdePkg/Include/Library/UefiLib.h b/OldMdePkg/Include/Library/UefiLib.h index 9eaf48c..03dc5dc 100644 --- a/OldMdePkg/Include/Library/UefiLib.h +++ b/OldMdePkg/Include/Library/UefiLib.h @@ -180,7 +180,7 @@ EfiInitializeLock ( **/
#define EFI_INITIALIZE_LOCK_VARIABLE(Priority) \
- {Priority, EFI_TPL_APPLICATION, EfiLockReleased }
+ {Priority, TPL_APPLICATION, EfiLockReleased }
/**
diff --git a/OldMdePkg/Include/Uefi/UefiSpec.h b/OldMdePkg/Include/Uefi/UefiSpec.h index 6f34077..ee1a23a 100644 --- a/OldMdePkg/Include/Uefi/UefiSpec.h +++ b/OldMdePkg/Include/Uefi/UefiSpec.h @@ -341,15 +341,22 @@ EFI_STATUS //
// EFI Event Types (name defined in spec)
//
-#define EVENT_TIMER 0x80000000
-#define EVENT_RUNTIME 0x40000000
-#define EVENT_RUNTIME_CONTEXT 0x20000000
+#define EVT_TIMER 0x80000000
+#define EVT_RUNTIME 0x40000000
+
+#define EVT_NOTIFY_WAIT 0x00000100
+#define EVT_NOTIFY_SIGNAL 0x00000200
+#define EVT_SIGNAL_EXIT_BOOT_SERVICES 0x00000201
+#define EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE 0x60000202
-#define EVENT_NOTIFY_WAIT 0x00000100
-#define EVENT_NOTIFY_SIGNAL 0x00000200
+#define EVENT_TIMER EVT_TIMER
+#define EVENT_RUNTIME EVT_RUNTIME
+#define EVENT_RUNTIME_CONTEXT 0x20000000
-#define EVENT_SIGNAL_EXIT_BOOT_SERVICES 0x00000201
-#define EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE 0x60000202
+#define EVENT_NOTIFY_WAIT EVT_NOTIFY_WAIT
+#define EVENT_NOTIFY_SIGNAL EVT_NOTIFY_SIGNAL
+#define EVENT_SIGNAL_EXIT_BOOT_SERVICES EVT_SIGNAL_EXIT_BOOT_SERVICES
+#define EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE
//
// Prior to UEFI 2.0 Tiano extended these enums. This was replaced by
diff --git a/OldMdePkg/Library/UefiDriverEntryPoint/DriverEntryPoint.c b/OldMdePkg/Library/UefiDriverEntryPoint/DriverEntryPoint.c index 9ec19e3..5e1a355 100644 --- a/OldMdePkg/Library/UefiDriverEntryPoint/DriverEntryPoint.c +++ b/OldMdePkg/Library/UefiDriverEntryPoint/DriverEntryPoint.c @@ -64,7 +64,7 @@ _DriverUnloadHandler ( /**
- Notification Entry of ExitBootService event. In the entry, all notifications in _gDriverExitBootServicesEvent[]
+ Notification Entry of ExitBootService event. In the entry, all notifications in _gDriverExitBootServicesEvent[]
would be invoked.
@param Event The Event that is being processed.
@@ -127,8 +127,8 @@ _ModuleEntryPoint ( //
if (_gDriverExitBootServicesEvent[0] != NULL) {
Status = gBS->CreateEvent (
- EFI_EVENT_SIGNAL_EXIT_BOOT_SERVICES,
- EFI_TPL_NOTIFY,
+ EVT_SIGNAL_EXIT_BOOT_SERVICES,
+ TPL_NOTIFY,
_DriverExitBootServices,
NULL,
&_mDriverExitBootServicesNotifyEvent
diff --git a/OldMdePkg/Library/UefiLib/UefiLib.c b/OldMdePkg/Library/UefiLib/UefiLib.c index f03b881..72a2eb8 100644 --- a/OldMdePkg/Library/UefiLib/UefiLib.c +++ b/OldMdePkg/Library/UefiLib/UefiLib.c @@ -2,13 +2,13 @@ Mde UEFI library functions.
Copyright (c) 2006 - 2007, Intel Corporation<BR>
- 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
+ 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.
+ 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: UefiLib.c
@@ -41,9 +41,9 @@ CompareIso639LanguageCode ( }
/**
- This function searches the list of configuration tables stored in the EFI System
- Table for a table with a GUID that matches TableGuid. If a match is found,
- then a pointer to the configuration table is returned in Table, and EFI_SUCCESS
+ This function searches the list of configuration tables stored in the EFI System
+ Table for a table with a GUID that matches TableGuid. If a match is found,
+ then a pointer to the configuration table is returned in Table, and EFI_SUCCESS
is returned. If a matching GUID is not found, then EFI_NOT_FOUND is returned.
@param TableGuid Pointer to table's GUID type..
@@ -55,7 +55,7 @@ CompareIso639LanguageCode ( **/
EFI_STATUS
EFIAPI
-EfiGetSystemConfigurationTable (
+EfiGetSystemConfigurationTable (
IN EFI_GUID *TableGuid,
OUT VOID **Table
)
@@ -79,9 +79,9 @@ EfiGetSystemConfigurationTable ( }
/**
- This function causes the notification function to be executed for every protocol
- of type ProtocolGuid instance that exists in the system when this function is
- invoked. In addition, every time a protocol of type ProtocolGuid instance is
+ This function causes the notification function to be executed for every protocol
+ of type ProtocolGuid instance that exists in the system when this function is
+ invoked. In addition, every time a protocol of type ProtocolGuid instance is
installed or reinstalled, the notification function is also executed.
@param ProtocolGuid Supplies GUID of the protocol upon whose installation the event is fired.
@@ -90,7 +90,7 @@ EfiGetSystemConfigurationTable ( @param NotifyContext The context parameter to pass to NotifyFunction.
@param Registration A pointer to a memory location to receive the registration value.
- @return The notification event that was created.
+ @return The notification event that was created.
**/
EFI_EVENT
@@ -111,7 +111,7 @@ EfiCreateProtocolNotifyEvent( //
Status = gBS->CreateEvent (
- EFI_EVENT_NOTIFY_SIGNAL,
+ EVT_NOTIFY_SIGNAL,
NotifyTpl,
NotifyFunction,
NotifyContext,
@@ -142,13 +142,13 @@ EfiCreateProtocolNotifyEvent( /**
This function creates an event using NotifyTpl, NoifyFunction, and NotifyContext.
- This event is signaled with EfiNamedEventSignal(). This provide the ability for
+ This event is signaled with EfiNamedEventSignal(). This provide the ability for
one or more listeners on the same event named by the GUID specified by Name.
@param Name Supplies GUID name of the event.
@param NotifyTpl Supplies the task priority level of the event notifications.
@param NotifyFunction Supplies the function to notify when the event is signaled.
- @param NotifyContext The context parameter to pass to NotifyFunction.
+ @param NotifyContext The context parameter to pass to NotifyFunction.
@param Registration A pointer to a memory location to receive the registration value.
@retval EFI_SUCCESS A named event was created.
@@ -173,7 +173,7 @@ EfiNamedEventListen ( // Create event
//
Status = gBS->CreateEvent (
- EFI_EVENT_NOTIFY_SIGNAL,
+ EVT_NOTIFY_SIGNAL,
NotifyTpl,
NotifyFunction,
(VOID *) NotifyContext,
@@ -206,7 +206,7 @@ EfiNamedEventListen ( }
/**
- This function signals the named event specified by Name. The named event must
+ This function signals the named event specified by Name. The named event must
have been created with EfiNamedEventListen().
@param Name Supplies GUID name of the event.
@@ -243,13 +243,13 @@ EfiNamedEventSignal ( return EFI_SUCCESS;
}
-/**
+/**
Returns the current TPL.
- This function returns the current TPL. There is no EFI service to directly
- retrieve the current TPL. Instead, the RaiseTPL() function is used to raise
- the TPL to TPL_HIGH_LEVEL. This will return the current TPL. The TPL level
- can then immediately be restored back to the current TPL level with a call
+ This function returns the current TPL. There is no EFI service to directly
+ retrieve the current TPL. Instead, the RaiseTPL() function is used to raise
+ the TPL to TPL_HIGH_LEVEL. This will return the current TPL. The TPL level
+ can then immediately be restored back to the current TPL level with a call
to RestoreTPL().
@param VOID
@@ -265,7 +265,7 @@ EfiGetCurrentTpl ( {
EFI_TPL Tpl;
- Tpl = gBS->RaiseTPL (EFI_TPL_HIGH_LEVEL);
+ Tpl = gBS->RaiseTPL (TPL_HIGH_LEVEL);
gBS->RestoreTPL (Tpl);
return Tpl;
@@ -273,8 +273,8 @@ EfiGetCurrentTpl ( /**
- This function initializes a basic mutual exclusion lock to the released state
- and returns the lock. Each lock provides mutual exclusion access at its task
+ This function initializes a basic mutual exclusion lock to the released state
+ and returns the lock. Each lock provides mutual exclusion access at its task
priority level. Since there is no preemption or multiprocessor support in EFI,
acquiring the lock only consists of raising to the locks TPL.
@@ -292,17 +292,17 @@ EfiInitializeLock ( )
{
ASSERT (Lock != NULL);
- ASSERT (Priority <= EFI_TPL_HIGH_LEVEL);
+ ASSERT (Priority <= TPL_HIGH_LEVEL);
Lock->Tpl = Priority;
- Lock->OwnerTpl = EFI_TPL_APPLICATION;
+ Lock->OwnerTpl = TPL_APPLICATION;
Lock->Lock = EfiLockReleased ;
return Lock;
}
/**
- This function raises the system's current task priority level to the task
- priority level of the mutual exclusion lock. Then, it places the lock in the
+ This function raises the system's current task priority level to the task
+ priority level of the mutual exclusion lock. Then, it places the lock in the
acquired state.
@param Priority The task priority level of the lock.
@@ -322,8 +322,8 @@ EfiAcquireLock ( }
/**
- This function raises the system's current task priority level to the task
- priority level of the mutual exclusion lock. Then, it attempts to place the
+ This function raises the system's current task priority level to the task
+ priority level of the mutual exclusion lock. Then, it attempts to place the
lock in the acquired state.
@param Lock A pointer to the lock to acquire.
@@ -357,8 +357,8 @@ EfiAcquireLockOrFail ( }
/**
- This function transitions a mutual exclusion lock from the acquired state to
- the released state, and restores the system's task priority level to its
+ This function transitions a mutual exclusion lock from the acquired state to
+ the released state, and restores the system's task priority level to its
previous level.
@param Lock A pointer to the lock to release.
@@ -376,7 +376,7 @@ EfiReleaseLock ( ASSERT (Lock->Lock == EfiLockAcquired);
Tpl = Lock->OwnerTpl;
-
+
Lock->Lock = EfiLockReleased;
gBS->RestoreTPL (Tpl);
@@ -389,7 +389,7 @@ EfiReleaseLock ( currently managing the controller specified by ControllerHandle. This test
is performed by evaluating if the the protocol specified by ProtocolGuid is
present on ControllerHandle and is was opened by DriverBindingHandle with an
- attribute of EFI_OPEN_PROTOCOL_BY_DRIVER.
+ attribute of EFI_OPEN_PROTOCOL_BY_DRIVER.
If ProtocolGuid is NULL, then ASSERT().
@param ControllerHandle A handle for a controller to test. @@ -452,10 +452,10 @@ EfiTestManagedDevice ( ChildHandle with an attribute of EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER.
If ProtocolGuid is NULL, then ASSERT().
- @param ControllerHandle A handle for a (parent) controller to test. + @param ControllerHandle A handle for a (parent) controller to test. @param ChildHandle A child handle to test. @param ConsumsedGuid Supplies the protocol that the child controller - opens on its parent controller. + opens on its parent controller. @retval EFI_SUCCESS ChildHandle is a child of the ControllerHandle. @retval EFI_UNSUPPORTED ChildHandle is not a child of the @@ -502,37 +502,37 @@ EfiTestChildHandle ( break;
}
}
-
+
FreePool (OpenInfoBuffer);
return Status;
}
/**
- This function looks up a Unicode string in UnicodeStringTable. If Language is
+ This function looks up a Unicode string in UnicodeStringTable. If Language is
a member of SupportedLanguages and a Unicode string is found in UnicodeStringTable
- that matches the language code specified by Language, then it is returned in
+ that matches the language code specified by Language, then it is returned in
UnicodeString.
- @param Language A pointer to the ISO 639-2 language code for the
+ @param Language A pointer to the ISO 639-2 language code for the
Unicode string to look up and return.
- @param SupportedLanguages A pointer to the set of ISO 639-2 language codes
- that the Unicode string table supports. Language
+ @param SupportedLanguages A pointer to the set of ISO 639-2 language codes
+ that the Unicode string table supports. Language
must be a member of this set.
@param UnicodeStringTable A pointer to the table of Unicode strings.
@param UnicodeString A pointer to the Unicode string from UnicodeStringTable
that matches the language specified by Language.
- @retval EFI_SUCCESS The Unicode string that matches the language
+ @retval EFI_SUCCESS The Unicode string that matches the language
specified by Language was found
- in the table of Unicoide strings UnicodeStringTable,
+ in the table of Unicoide strings UnicodeStringTable,
and it was returned in UnicodeString.
@retval EFI_INVALID_PARAMETER Language is NULL.
@retval EFI_INVALID_PARAMETER UnicodeString is NULL.
@retval EFI_UNSUPPORTED SupportedLanguages is NULL.
@retval EFI_UNSUPPORTED UnicodeStringTable is NULL.
- @retval EFI_UNSUPPORTED The language specified by Language is not a
+ @retval EFI_UNSUPPORTED The language specified by Language is not a
member of SupportedLanguages.
- @retval EFI_UNSUPPORTED The language specified by Language is not
+ @retval EFI_UNSUPPORTED The language specified by Language is not
supported by UnicodeStringTable.
**/
@@ -593,13 +593,13 @@ LookupUnicodeString ( /**
This function adds a Unicode string to UnicodeStringTable.
- If Language is a member of SupportedLanguages then UnicodeString is added to
- UnicodeStringTable. New buffers are allocated for both Language and
- UnicodeString. The contents of Language and UnicodeString are copied into
- these new buffers. These buffers are automatically freed when
+ If Language is a member of SupportedLanguages then UnicodeString is added to
+ UnicodeStringTable. New buffers are allocated for both Language and
+ UnicodeString. The contents of Language and UnicodeString are copied into
+ these new buffers. These buffers are automatically freed when
FreeUnicodeStringTable() is called.
- @param Language A pointer to the ISO 639-2 language code for the Unicode
+ @param Language A pointer to the ISO 639-2 language code for the Unicode
string to add.
@param SupportedLanguages A pointer to the set of ISO 639-2 language codes
that the Unicode string table supports.
@@ -607,19 +607,19 @@ LookupUnicodeString ( @param UnicodeStringTable A pointer to the table of Unicode strings.
@param UnicodeString A pointer to the Unicode string to add.
- @retval EFI_SUCCESS The Unicode string that matches the language
- specified by Language was found in the table of
- Unicode strings UnicodeStringTable, and it was
+ @retval EFI_SUCCESS The Unicode string that matches the language
+ specified by Language was found in the table of
+ Unicode strings UnicodeStringTable, and it was
returned in UnicodeString.
@retval EFI_INVALID_PARAMETER Language is NULL.
@retval EFI_INVALID_PARAMETER UnicodeString is NULL.
@retval EFI_INVALID_PARAMETER UnicodeString is an empty string.
@retval EFI_UNSUPPORTED SupportedLanguages is NULL.
- @retval EFI_ALREADY_STARTED A Unicode string with language Language is
+ @retval EFI_ALREADY_STARTED A Unicode string with language Language is
already present in UnicodeStringTable.
- @retval EFI_OUT_OF_RESOURCES There is not enough memory to add another
+ @retval EFI_OUT_OF_RESOURCES There is not enough memory to add another
Unicode string to UnicodeStringTable.
- @retval EFI_UNSUPPORTED The language specified by Language is not a
+ @retval EFI_UNSUPPORTED The language specified by Language is not a
member of SupportedLanguages.
**/
@@ -760,7 +760,7 @@ AddUnicodeString ( /**
This function frees the table of Unicode strings in UnicodeStringTable.
If UnicodeStringTable is NULL, then EFI_SUCCESS is returned.
- Otherwise, each language code, and each Unicode string in the Unicode string
+ Otherwise, each language code, and each Unicode string in the Unicode string
table are freed, and EFI_SUCCESS is returned.
@param UnicodeStringTable A pointer to the table of Unicode strings.
diff --git a/OldMdePkg/Library/UefiLib/UefiNotTiano.c b/OldMdePkg/Library/UefiLib/UefiNotTiano.c index 081e254..d588ece 100644 --- a/OldMdePkg/Library/UefiLib/UefiNotTiano.c +++ b/OldMdePkg/Library/UefiLib/UefiNotTiano.c @@ -59,7 +59,7 @@ EfiCreateEventLegacyBoot ( )
{
return EfiCreateEventLegacyBootEx (
- EFI_TPL_CALLBACK,
+ TPL_CALLBACK,
InternalEmptyFuntion,
NULL,
LegacyBootEvent
@@ -114,7 +114,7 @@ EfiCreateEventLegacyBootEx ( // For UEFI 2.0 and the future use an Event Group
//
Status = gBS->CreateEventEx (
- EVENT_NOTIFY_SIGNAL,
+ EVT_NOTIFY_SIGNAL,
NotifyTpl,
NotifyFunction,
NotifyContext,
@@ -149,7 +149,7 @@ EfiCreateEventReadyToBoot ( )
{
return EfiCreateEventReadyToBootEx (
- EFI_TPL_CALLBACK,
+ TPL_CALLBACK,
InternalEmptyFuntion,
NULL,
ReadyToBootEvent
@@ -204,7 +204,7 @@ EfiCreateEventReadyToBootEx ( // For UEFI 2.0 and the future use an Event Group
//
Status = gBS->CreateEventEx (
- EVENT_NOTIFY_SIGNAL,
+ EVT_NOTIFY_SIGNAL,
NotifyTpl,
NotifyFunction,
NotifyContext,
|