From eff98cf9daf7353274f958bea570f0da419a09a5 Mon Sep 17 00:00:00 2001 From: Olivier Martin Date: Wed, 6 May 2015 11:15:44 +0000 Subject: [PATCH] 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 Reviewed-by: Ronald Cron git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17343 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Drivers/Isp1761UsbDxe/Isp1761UsbDxe.c | 3 +-- .../Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf | 3 +-- EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf | 3 +-- EmbeddedPkg/EmbeddedPkg.dsc | 21 +++++++++++++------ EmbeddedPkg/Universal/MmcDxe/Mmc.h | 3 ++- EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c | 5 ++--- EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf | 3 +-- .../Universal/MmcDxe/MmcIdentification.c | 8 +++---- 8 files changed, 26 insertions(+), 23 deletions(-) diff --git a/EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.c b/EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.c index 77d4f2a837..dfc3786297 100644 --- a/EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.c +++ b/EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.c @@ -1,6 +1,6 @@ /** @file - Copyright (c) 2013-2014, ARM Ltd. All rights reserved.
+ Copyright (c) 2013-2015, ARM Ltd. All rights reserved.
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 #include #include #include diff --git a/EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf b/EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf index 7e0395a47f..52ebc11c7f 100644 --- a/EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf +++ b/EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf @@ -1,6 +1,6 @@ #/** @file # -# Copyright (c) 2013-2014, ARM Ltd. All rights reserved.
+# Copyright (c) 2013-2015, ARM Ltd. All rights reserved.
# # 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 diff --git a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf b/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf index 392a7b537a..9e5f98b4bd 100644 --- a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf +++ b/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf @@ -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] diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc index d3f8e7c507..76c5ced386 100644 --- a/EmbeddedPkg/EmbeddedPkg.dsc +++ b/EmbeddedPkg/EmbeddedPkg.dsc @@ -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 { + + TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf + } EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf # FDT installation - EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf - - EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf + EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf { + + # It depends on BdsLib that depends on TimerLib + TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf + } + + EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf { + + # It depends on BdsLib that depends on TimerLib + TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf + } EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcpDxe.inf diff --git a/EmbeddedPkg/Universal/MmcDxe/Mmc.h b/EmbeddedPkg/Universal/MmcDxe/Mmc.h index 301561a282..46a156cecf 100644 --- a/EmbeddedPkg/Universal/MmcDxe/Mmc.h +++ b/EmbeddedPkg/Universal/MmcDxe/Mmc.h @@ -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 #include +#include #define MMC_TRACE(txt) DEBUG((EFI_D_BLKIO, "MMC: " txt "\n")) diff --git a/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c b/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c index 04c82613d5..0e1ef57263 100644 --- a/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c +++ b/EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c @@ -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 -#include #include "Mmc.h" @@ -268,7 +267,7 @@ MmcIoBlocks ( break; // Prevents delay once finished } } - NanoSecondDelay (100); + gBS->Stall (1); } Status = MmcNotifyState (MmcHostInstance, MmcTransferState); diff --git a/EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf b/EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf index f9a2b9c703..a07288c754 100644 --- a/EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf +++ b/EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf @@ -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 diff --git a/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c b/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c index 08cc405ed8..2d8038ffe0 100644 --- a/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c +++ b/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c @@ -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 - #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--; } } -- 2.39.2