update

[l4.git] / kernel / fiasco / src / kern / arm / bsp / realview / timer-arm-realview.cpp

diff --git a/kernel/fiasco/src/kern/arm/bsp/realview/timer-arm-realview.cpp b/kernel/fiasco/src/kern/arm/bsp/realview/timer-arm-realview.cpp
index b8f767b708345c12689447dd3bec403d997c53d4..1cdf290e9dd5be620f37c11748aaef13bb8cceda 100644 (file)
--- a/kernel/fiasco/src/kern/arm/bsp/realview/timer-arm-realview.cpp
+++ b/kernel/fiasco/src/kern/arm/bsp/realview/timer-arm-realview.cpp
@@ -18,6 +18,15 @@ public:
   static unsigned irq() { return 34; }
 };
 
+// --------------------------------------------------------------------------
+INTERFACE [arm && realview_vexpress_a15 && arm_generic_timer]:
+
+EXTENSION class Timer
+{
+public:
+  static unsigned irq() { return 27; }
+};
+
 // --------------------------------------------------------------------------
 INTERFACE [arm && sp804 && !realview_vexpress_a15]:
 
@@ -55,16 +64,6 @@ void Timer::init(Cpu_number)
   sp804->enable(Timer_sp804::Ctrl_periodic | Timer_sp804::Ctrl_ie);
 }
 
-static inline
-Unsigned64
-Timer::timer_to_us(Unsigned32 /*cr*/)
-{ return 0; }
-
-static inline
-Unsigned64
-Timer::us_to_timer(Unsigned64 us)
-{ (void)us; return 0; }
-
 PUBLIC static inline
 void
 Timer::acknowledge()
@@ -88,3 +87,10 @@ Timer::system_clock()
   else
     return Kip::k()->clock;
 }
+
+// --------------------------------------------------------------------------
+IMPLEMENTATION [arm && realview_vexpress_a15 && arm_generic_timer]:
+
+IMPLEMENT
+void Timer::bsp_init(Cpu_number)
+{}