X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Farch%2Farmv7%2Fplatform_tegra2.c;h=d955fbfa32f594da7b356d3481360de0b4e8b63d;hb=71402d670b1de4f4db7c1768e92ac1f723b51d9a;hp=21ff862f3173e3b7f1af4199b0fc25d077c8d365;hpb=9a135546ed260546b4903424232faf1a3c3a8be5;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/arch/armv7/platform_tegra2.c b/KernelLand/Kernel/arch/armv7/platform_tegra2.c
index 21ff862f..d955fbfa 100644
--- a/KernelLand/Kernel/arch/armv7/platform_tegra2.c
+++ b/KernelLand/Kernel/arch/armv7/platform_tegra2.c
@@ -6,7 +6,9 @@
  * - Tegra2 Core code
  */
 #include <acess.h>
+#include <timers.h>	// MicroSleep
 #include "platform_tegra2.h"
+#include "include/options.h"
 
 // === CONSTANTS ===
 #define TIMER0_INT	(0*32+0)	// Pri #0
@@ -22,12 +24,16 @@ extern void	Timer_CallTimers(void);
 
 // === PROTORTYPES ===
 void	Timer_IRQHandler_SysClock(int IRQ, void *_unused);
+void	Timer_IRQHandler_Timer2(int IRQ, void *_unused);
+void	Timer_IRQHandler_Timer3(int IRQ, void *_unused);
+void	Timer_IRQHandler_Timer4(int IRQ, void *_unused);
 void	Time_Setup(void);
+tTime	Time_GetTickOffset(void);	// TODO: move to header
 
 // === GLOBALS ===
 // - Addresses for the GIC to use
-tPAddr	gGIC_InterfaceAddr = 0x50040000;
-tPAddr	gGIC_DistributorAddr = 0x50041000;
+tPAddr	gGIC_InterfaceAddr = GICI_PADDR;
+tPAddr	gGIC_DistributorAddr = GICD_PADDR;
 // - Map of timer registers
 volatile struct sTimersMap *gpTimersMap;
 volatile struct sClockResetMap *gpClockResetMap;
@@ -43,6 +49,7 @@ void Timer_IRQHandler_SysClock(int IRQ, void *_unused)
 {
 	giTimestamp += 100;
 	gpTimersMap->TMR1.PCR_0 = (1<<30);
+	Timer_CallTimers();
 }
 
 void Timer_IRQHandler_Timer2(int IRQ, void *_unused)
@@ -69,6 +76,11 @@ void Time_MicroSleep(Uint16 Microsecs)
 		;
 }
 
+tTime Time_GetTickOffset(void)
+{
+	return (gpTimersMap->TIMERUS.CNTR_1US/1000) % 100;
+}
+
 void Time_Setup(void)
 {
 	gpTimersMap = (void*)MM_MapHWPages(0x60005000, 1);