mirror of https://github.com/acidanthera/audk.git
ArmPkg: Renamed ArmArchTimerLib.h to ArmArchTimer.h
The ArmArchTimerLib.h include file is not directly related to the TimerLib instance ArmArchTimerLib, so the name is confusing. Rename to ArmArchTimer.h instead. Contributed-under: TianoCore Contribution Agreement 1.0 Acked-by: Laszlo Ersek <lersek@redhat.com> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Reviewed-By: Olivier Martin <olivier.martin@arm.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16073 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
dc63be2495
commit
d4bb43cee1
|
@ -15,7 +15,7 @@
|
||||||
#include <Base.h>
|
#include <Base.h>
|
||||||
#include <Library/ArmLib.h>
|
#include <Library/ArmLib.h>
|
||||||
#include <Library/ArmCpuLib.h>
|
#include <Library/ArmCpuLib.h>
|
||||||
#include <Library/ArmArchTimerLib.h>
|
#include <Library/ArmArchTimer.h>
|
||||||
#include <Library/DebugLib.h>
|
#include <Library/DebugLib.h>
|
||||||
#include <Library/IoLib.h>
|
#include <Library/IoLib.h>
|
||||||
#include <Library/PcdLib.h>
|
#include <Library/PcdLib.h>
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#include <Base.h>
|
#include <Base.h>
|
||||||
#include <Library/ArmLib.h>
|
#include <Library/ArmLib.h>
|
||||||
#include <Library/ArmCpuLib.h>
|
#include <Library/ArmCpuLib.h>
|
||||||
#include <Library/ArmArchTimerLib.h>
|
#include <Library/ArmArchTimer.h>
|
||||||
#include <Library/DebugLib.h>
|
#include <Library/DebugLib.h>
|
||||||
#include <Library/IoLib.h>
|
#include <Library/IoLib.h>
|
||||||
#include <Library/PcdLib.h>
|
#include <Library/PcdLib.h>
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
#include <Base.h>
|
#include <Base.h>
|
||||||
#include <Library/ArmCpuLib.h>
|
#include <Library/ArmCpuLib.h>
|
||||||
#include <Library/ArmArchTimerLib.h>
|
#include <Library/ArmArchTimer.h>
|
||||||
#include <Library/PcdLib.h>
|
#include <Library/PcdLib.h>
|
||||||
|
|
||||||
#include <Chipset/ArmAemV8.h>
|
#include <Chipset/ArmAemV8.h>
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#include <Library/UefiLib.h>
|
#include <Library/UefiLib.h>
|
||||||
#include <Library/PcdLib.h>
|
#include <Library/PcdLib.h>
|
||||||
#include <Library/IoLib.h>
|
#include <Library/IoLib.h>
|
||||||
#include <Library/ArmArchTimerLib.h>
|
#include <Library/ArmArchTimer.h>
|
||||||
|
|
||||||
#include <Protocol/Timer.h>
|
#include <Protocol/Timer.h>
|
||||||
#include <Protocol/HardwareInterrupt.h>
|
#include <Protocol/HardwareInterrupt.h>
|
||||||
|
|
|
@ -12,8 +12,8 @@
|
||||||
|
|
||||||
**/
|
**/
|
||||||
|
|
||||||
#ifndef __ARM_ARCH_TIMER_LIB_H__
|
#ifndef __ARM_ARCH_TIMER_H__
|
||||||
#define __ARM_ARCH_TIMER_LIB_H__
|
#define __ARM_ARCH_TIMER_H__
|
||||||
|
|
||||||
#define ARM_ARCH_TIMER_ENABLE (1 << 0)
|
#define ARM_ARCH_TIMER_ENABLE (1 << 0)
|
||||||
#define ARM_ARCH_TIMER_IMASK (1 << 1)
|
#define ARM_ARCH_TIMER_IMASK (1 << 1)
|
||||||
|
@ -112,4 +112,4 @@ ArmArchTimerSetCompareVal (
|
||||||
IN UINT64 Val
|
IN UINT64 Val
|
||||||
);
|
);
|
||||||
|
|
||||||
#endif // __ARM_ARCH_TIMER_LIB_H__
|
#endif // __ARM_ARCH_TIMER_H__
|
|
@ -20,7 +20,7 @@
|
||||||
#include <Library/TimerLib.h>
|
#include <Library/TimerLib.h>
|
||||||
#include <Library/DebugLib.h>
|
#include <Library/DebugLib.h>
|
||||||
#include <Library/PcdLib.h>
|
#include <Library/PcdLib.h>
|
||||||
#include <Library/ArmArchTimerLib.h>
|
#include <Library/ArmArchTimer.h>
|
||||||
|
|
||||||
#define TICKS_PER_MICRO_SEC (PcdGet32 (PcdArmArchTimerFreqInHz)/1000000U)
|
#define TICKS_PER_MICRO_SEC (PcdGet32 (PcdArmArchTimerFreqInHz)/1000000U)
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
#include <Library/DebugLib.h>
|
#include <Library/DebugLib.h>
|
||||||
#include "AArch64Lib.h"
|
#include "AArch64Lib.h"
|
||||||
#include "ArmLibPrivate.h"
|
#include "ArmLibPrivate.h"
|
||||||
#include <Library/ArmArchTimerLib.h>
|
#include <Library/ArmArchTimer.h>
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
EFIAPI
|
EFIAPI
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
#include <Library/DebugLib.h>
|
#include <Library/DebugLib.h>
|
||||||
#include "ArmV7Lib.h"
|
#include "ArmV7Lib.h"
|
||||||
#include "ArmLibPrivate.h"
|
#include "ArmLibPrivate.h"
|
||||||
#include <Library/ArmArchTimerLib.h>
|
#include <Library/ArmArchTimer.h>
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
EFIAPI
|
EFIAPI
|
||||||
|
|
Loading…
Reference in New Issue