tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-24 06:04:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

EmbeddedPkg: Remove dependency on TimerLib

Browse Source 
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:
Olivier Martin 2015-05-06 11:15:44 +00:00 committed by oliviermartin
parent 2ff41466ef
commit eff98cf9da
8 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.c
View File

@ -1,6 +1,6 @@
/** @file /** @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 This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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/DebugLib.h>
#include <Library/UefiBootServicesTableLib.h> #include <Library/UefiBootServicesTableLib.h>
#include <Library/UefiDriverEntryPoint.h> #include <Library/UefiDriverEntryPoint.h>

3
EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf
View File

@ -1,6 +1,6 @@
#/** @file #/** @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 # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # are licensed and made available under the terms and conditions of the BSD License
@ -27,7 +27,6 @@
DebugLib DebugLib
IoLib IoLib
MemoryAllocationLib MemoryAllocationLib
TimerLib
UefiBootServicesTableLib UefiBootServicesTableLib
UefiDriverEntryPoint UefiDriverEntryPoint

3
EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.inf
View File

@ -1,7 +1,7 @@
#/** @file #/** @file
# INF file for the LAN9118 Network Controller Driver. # 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 # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # are licensed and made available under the terms and conditions of the BSD License
@ -40,7 +40,6 @@
BaseMemoryLib BaseMemoryLib
ArmLib ArmLib
IoLib IoLib
TimerLib
DevicePathLib DevicePathLib
[Protocols] [Protocols]

19
EmbeddedPkg/EmbeddedPkg.dsc
View File

@ -59,8 +59,6 @@
UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf
EfiFileLib|EmbeddedPkg/Library/EfiFileLib/EfiFileLib.inf EfiFileLib|EmbeddedPkg/Library/EfiFileLib/EfiFileLib.inf
TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf
ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf ReportStatusCodeLib|IntelFrameworkModulePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.inf
PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf PeCoffGetEntryPointLib|MdePkg/Library/BasePeCoffGetEntryPointLib/BasePeCoffGetEntryPointLib.inf
@ -265,14 +263,25 @@
EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
EmbeddedPkg/SerialDxe/SerialDxe.inf EmbeddedPkg/SerialDxe/SerialDxe.inf
EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOutSerial.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 EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf
# FDT installation # 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/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf
EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcpDxe.inf EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcpDxe.inf

3
EmbeddedPkg/Universal/MmcDxe/Mmc.h
View File

@ -1,7 +1,7 @@
/** @file /** @file
Main Header file for the MMC DXE driver 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 This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
@ -25,6 +25,7 @@
#include <Library/UefiLib.h> #include <Library/UefiLib.h>
#include <Library/DebugLib.h> #include <Library/DebugLib.h>
#include <Library/UefiBootServicesTableLib.h>
#define MMC_TRACE(txt) DEBUG((EFI_D_BLKIO, "MMC: " txt "\n")) #define MMC_TRACE(txt) DEBUG((EFI_D_BLKIO, "MMC: " txt "\n"))

5
EmbeddedPkg/Universal/MmcDxe/MmcBlockIo.c
View File

@ -1,6 +1,6 @@
/** @file /** @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 * This program and the accompanying materials
* are licensed and made available under the terms and conditions of the BSD License * are licensed and made available under the terms and conditions of the BSD License
@ -13,7 +13,6 @@
**/ **/
#include <Library/BaseMemoryLib.h> #include <Library/BaseMemoryLib.h>
#include <Library/TimerLib.h>
#include "Mmc.h" #include "Mmc.h"
@ -268,7 +267,7 @@ MmcIoBlocks (
break; // Prevents delay once finished break; // Prevents delay once finished
} }
} }
NanoSecondDelay (100); gBS->Stall (1);
} }
Status = MmcNotifyState (MmcHostInstance, MmcTransferState); Status = MmcNotifyState (MmcHostInstance, MmcTransferState);

3
EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf
View File

@ -1,7 +1,7 @@
#/** @file #/** @file
# Build file for the MMC DXE driver # 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 # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # are licensed and made available under the terms and conditions of the BSD License
@ -39,7 +39,6 @@
UefiLib UefiLib
UefiDriverEntryPoint UefiDriverEntryPoint
BaseMemoryLib BaseMemoryLib
TimerLib
[Protocols] [Protocols]
gEfiDiskIoProtocolGuid gEfiDiskIoProtocolGuid

8
EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c
View File

@ -1,6 +1,6 @@
/** @file /** @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 * This program and the accompanying materials
* are licensed and made available under the terms and conditions of the BSD License * 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" #include "Mmc.h"
typedef union { typedef union {
@ -322,7 +320,7 @@ MmcIdentificationMode (
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {
if (!MmcHostInstance->CardInfo.OCRData.PowerUp) { if (!MmcHostInstance->CardInfo.OCRData.PowerUp) {
MicroSecondDelay (1); gBS->Stall (1);
Timeout--; Timeout--;
} else { } else {
if ((MmcHostInstance->CardInfo.CardType == SD_CARD_2) && (MmcHostInstance->CardInfo.OCRData.AccessMode & BIT1)) { 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 break; // The MMC/SD card is ready. Continue the Identification Mode
} }
} else { } else {
MicroSecondDelay (1); gBS->Stall (1);
Timeout--; Timeout--;
} }
} }