Revision: 14908
http://sourceforge.net/p/edk2/code/14908
Author: oliviermartin
Date: 2013-11-28 21:37:36 +0000 (Thu, 28 Nov 2013)
Log Message:
-----------
ArmPkg: Move definition of ArmIsArchTimerImplemented / ArmReadIdPfrN to ArmLib
These functions are not chipset specific.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <[email protected]>
Modified Paths:
--------------
trunk/edk2/ArmPkg/Include/Chipset/AArch64.h
trunk/edk2/ArmPkg/Include/Chipset/ArmV7.h
trunk/edk2/ArmPkg/Include/Library/ArmLib.h
trunk/edk2/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c
Modified: trunk/edk2/ArmPkg/Include/Chipset/AArch64.h
===================================================================
--- trunk/edk2/ArmPkg/Include/Chipset/AArch64.h 2013-11-28 21:37:10 UTC (rev
14907)
+++ trunk/edk2/ArmPkg/Include/Chipset/AArch64.h 2013-11-28 21:37:36 UTC (rev
14908)
@@ -88,24 +88,6 @@
UINTN
EFIAPI
-ArmIsArchTimerImplemented (
- VOID
- );
-
-UINTN
-EFIAPI
-ArmReadIdPfr0 (
- VOID
- );
-
-UINTN
-EFIAPI
-ArmReadIdPfr1 (
- VOID
- );
-
-UINTN
-EFIAPI
ArmGetTCR (
VOID
);
Modified: trunk/edk2/ArmPkg/Include/Chipset/ArmV7.h
===================================================================
--- trunk/edk2/ArmPkg/Include/Chipset/ArmV7.h 2013-11-28 21:37:10 UTC (rev
14907)
+++ trunk/edk2/ArmPkg/Include/Chipset/ArmV7.h 2013-11-28 21:37:36 UTC (rev
14908)
@@ -101,18 +101,6 @@
UINTN Value
);
-UINTN
-EFIAPI
-ArmIsArchTimerImplemented (
- VOID
- );
-
-UINTN
-EFIAPI
-ArmReadIdPfr1 (
- VOID
- );
-
UINT32
EFIAPI
ArmReadNsacr (
Modified: trunk/edk2/ArmPkg/Include/Library/ArmLib.h
===================================================================
--- trunk/edk2/ArmPkg/Include/Library/ArmLib.h 2013-11-28 21:37:10 UTC (rev
14907)
+++ trunk/edk2/ArmPkg/Include/Library/ArmLib.h 2013-11-28 21:37:36 UTC (rev
14908)
@@ -193,7 +193,25 @@
ArmInstructionCacheLineLength (
VOID
);
-
+
+UINTN
+EFIAPI
+ArmIsArchTimerImplemented (
+ VOID
+ );
+
+UINTN
+EFIAPI
+ArmReadIdPfr0 (
+ VOID
+ );
+
+UINTN
+EFIAPI
+ArmReadIdPfr1 (
+ VOID
+ );
+
UINT32
EFIAPI
Cp15IdCode (
Modified: trunk/edk2/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c
===================================================================
--- trunk/edk2/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c 2013-11-28
21:37:10 UTC (rev 14907)
+++ trunk/edk2/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c 2013-11-28
21:37:36 UTC (rev 14908)
@@ -1,7 +1,7 @@
/** @file
Generic ARM implementation of TimerLib.h
- Copyright (c) 2011-2012, ARM Limited. All rights reserved.
+ Copyright (c) 2011-2013, 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
@@ -15,12 +15,12 @@
#include <Base.h>
+#include <Library/ArmLib.h>
#include <Library/BaseLib.h>
#include <Library/TimerLib.h>
#include <Library/DebugLib.h>
#include <Library/PcdLib.h>
#include <Library/ArmArchTimerLib.h>
-#include <Chipset/ArmV7.h>
#define TICKS_PER_MICRO_SEC (PcdGet32 (PcdArmArchTimerFreqInHz)/1000000U)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
