mirror of https://github.com/acidanthera/audk.git
EmbeddedPkg: Remove dependency on TimerLib
UEFI drivers should not depend on TimerLib. They should use BS.Stall() instead. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Olivier Martin <olivier.martin@arm.com> Reviewed-by: Ronald Cron <Ronald.Cron@arm.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17343 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
2ff41466ef
commit
eff98cf9da
|
@ -1,6 +1,6 @@
|
|||
/** @file
|
||||
|
||||
Copyright (c) 2013-2014, ARM Ltd. All rights reserved.<BR>
|
||||
Copyright (c) 2013-2015, ARM Ltd. All rights reserved.<BR>
|
||||
|
||||
This program and the accompanying materials
|
||||
are licensed and made available under the terms and conditions of the BSD License
|
||||
|
@ -12,7 +12,6 @@
|
|||
|
||||
**/
|
||||
|
||||
#include <Library/TimerLib.h>
|
||||
#include <Library/DebugLib.h>
|
||||
#include <Library/UefiBootServicesTableLib.h>
|
||||
#include <Library/UefiDriverEntryPoint.h>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#/** @file
|
||||
#
|
||||
# Copyright (c) 2013-2014, ARM Ltd. All rights reserved.<BR>
|
||||
# Copyright (c) 2013-2015, ARM Ltd. All rights reserved.<BR>
|
||||
#
|
||||
# This program and the accompanying materials
|
||||
# are licensed and made available under the terms and conditions of the BSD License
|
||||
|
@ -27,7 +27,6 @@
|
|||
DebugLib
|
||||
IoLib
|
||||
MemoryAllocationLib
|
||||
TimerLib
|
||||
UefiBootServicesTableLib
|
||||
UefiDriverEntryPoint
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#/** @file
|
||||
# INF file for the LAN9118 Network Controller Driver.
|
||||
#
|
||||
# Copyright (c) 2012-2014, ARM Limited. All rights reserved.
|
||||
# Copyright (c) 2012-2015, ARM Limited. All rights reserved.
|
||||
#
|
||||
# This program and the accompanying materials
|
||||
# are licensed and made available under the terms and conditions of the BSD License
|
||||
|
@ -40,7 +40,6 @@
|
|||
BaseMemoryLib
|
||||
ArmLib
|
||||
IoLib
|
||||
TimerLib
|
||||
DevicePathLib
|
||||
|
||||
[Protocols]
|
||||
|
|
|
@ -59,8 +59,6 @@
|
|||
UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
|
||||
EfiFileLib|EmbeddedPkg/Library/EfiFileLib/EfiFileLib.inf
|
||||
|
||||
TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
|
||||
|
||||
ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
|
||||
|
||||
PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
|
||||
|
@ -265,14 +263,25 @@
|
|||
EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
|
||||
EmbeddedPkg/SerialDxe/SerialDxe.inf
|
||||
EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOutSerial.inf
|
||||
EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf
|
||||
EmbeddedPkg/MetronomeDxe/MetronomeDxe.inf {
|
||||
<LibraryClasses>
|
||||
TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
|
||||
}
|
||||
|
||||
EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf
|
||||
|
||||
# FDT installation
|
||||
EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf
|
||||
EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf {
|
||||
<LibraryClasses>
|
||||
# It depends on BdsLib that depends on TimerLib
|
||||
TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
|
||||
}
|
||||
|
||||
EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf
|
||||
EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf {
|
||||
<LibraryClasses>
|
||||
# It depends on BdsLib that depends on TimerLib
|
||||
TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
|
||||
}
|
||||
EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf
|
||||
EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcpDxe.inf
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/** @file
|
||||
Main Header file for the MMC DXE driver
|
||||
|
||||
Copyright (c) 2011-2014, ARM Limited. All rights reserved.
|
||||
Copyright (c) 2011-2015, ARM Limited. All rights reserved.
|
||||
|
||||
This program and the accompanying materials
|
||||
are licensed and made available under the terms and conditions of the BSD License
|
||||
|
@ -25,6 +25,7 @@
|
|||
|
||||
#include <Library/UefiLib.h>
|
||||
#include <Library/DebugLib.h>
|
||||
#include <Library/UefiBootServicesTableLib.h>
|
||||
|
||||
#define MMC_TRACE(txt) DEBUG((EFI_D_BLKIO, "MMC: " txt "\n"))
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/** @file
|
||||
*
|
||||
* Copyright (c) 2011-2014, ARM Limited. All rights reserved.
|
||||
* Copyright (c) 2011-2015, ARM Limited. All rights reserved.
|
||||
*
|
||||
* This program and the accompanying materials
|
||||
* are licensed and made available under the terms and conditions of the BSD License
|
||||
|
@ -13,7 +13,6 @@
|
|||
**/
|
||||
|
||||
#include <Library/BaseMemoryLib.h>
|
||||
#include <Library/TimerLib.h>
|
||||
|
||||
#include "Mmc.h"
|
||||
|
||||
|
@ -268,7 +267,7 @@ MmcIoBlocks (
|
|||
break; // Prevents delay once finished
|
||||
}
|
||||
}
|
||||
NanoSecondDelay (100);
|
||||
gBS->Stall (1);
|
||||
}
|
||||
|
||||
Status = MmcNotifyState (MmcHostInstance, MmcTransferState);
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#/** @file
|
||||
# Build file for the MMC DXE driver
|
||||
#
|
||||
# Copyright (c) 2011-2014, ARM Limited. All rights reserved.
|
||||
# Copyright (c) 2011-2015, ARM Limited. All rights reserved.
|
||||
#
|
||||
# This program and the accompanying materials
|
||||
# are licensed and made available under the terms and conditions of the BSD License
|
||||
|
@ -39,7 +39,6 @@
|
|||
UefiLib
|
||||
UefiDriverEntryPoint
|
||||
BaseMemoryLib
|
||||
TimerLib
|
||||
|
||||
[Protocols]
|
||||
gEfiDiskIoProtocolGuid
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/** @file
|
||||
*
|
||||
* Copyright (c) 2011-2014, ARM Limited. All rights reserved.
|
||||
* Copyright (c) 2011-2015, ARM Limited. All rights reserved.
|
||||
*
|
||||
* This program and the accompanying materials
|
||||
* are licensed and made available under the terms and conditions of the BSD License
|
||||
|
@ -12,8 +12,6 @@
|
|||
*
|
||||
**/
|
||||
|
||||
#include <Library/TimerLib.h>
|
||||
|
||||
#include "Mmc.h"
|
||||
|
||||
typedef union {
|
||||
|
@ -322,7 +320,7 @@ MmcIdentificationMode (
|
|||
|
||||
if (!EFI_ERROR (Status)) {
|
||||
if (!MmcHostInstance->CardInfo.OCRData.PowerUp) {
|
||||
MicroSecondDelay (1);
|
||||
gBS->Stall (1);
|
||||
Timeout--;
|
||||
} else {
|
||||
if ((MmcHostInstance->CardInfo.CardType == SD_CARD_2) && (MmcHostInstance->CardInfo.OCRData.AccessMode & BIT1)) {
|
||||
|
@ -332,7 +330,7 @@ MmcIdentificationMode (
|
|||
break; // The MMC/SD card is ready. Continue the Identification Mode
|
||||
}
|
||||
} else {
|
||||
MicroSecondDelay (1);
|
||||
gBS->Stall (1);
|
||||
Timeout--;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue