X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Ftime.c;h=6a2d0399218713d28e7830a84230cb0e11b3586d;hb=01fbfb424865291e00242681662ed9b20c33a524;hp=cfe2f036a7e6bfa148fc27e701ffdfc7ca404f8c;hpb=95a7eaaa4a1065334125b65130866f8d1048ddb7;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/time.c b/Kernel/arch/x86/time.c
index cfe2f036..6a2d0399 100644
--- a/Kernel/arch/x86/time.c
+++ b/Kernel/arch/x86/time.c
@@ -3,42 +3,39 @@
  * Timekeeping
  * arch/x86/time.c
  */
-#include <common.h>
+#include <acess.h>
 
 // === MACROS ===
-#define	NUM_TIMERS	8
 #define	TIMER_QUANTUM	100
-#define TIMER_RATE	13	// (Max: 15, Min: 2) - 15 = 1Hz, 13 = 4Hz, 10 = 1024Hz
-#define TIMER_FREQ	(32768>>TIMER_RATE)	//Hz
+// 2^(15-rate), 15: 1HZ, 5: 1024Hz, 2: 8192Hz
+// (Max: 15, Min: 2) - 15 = 1Hz, 13 = 4Hz, 12 = 8Hz, 11 = 16Hz 10 = 32Hz, 2 = 8192Hz
+#define TIMER_RATE	12
+//#define TIMER_RATE	15
+#define TIMER_FREQ	(0x8000>>TIMER_RATE)	//Hz
 #define MS_PER_TICK_WHOLE	(1000/(TIMER_FREQ))
-#define MS_PER_TICK_FRACT	((Uint64)(1000*TIMER_FREQ-((Uint64)MS_PER_TICK_WHOLE)*0x80000000/TIMER_FREQ))
+#define MS_PER_TICK_FRACT	((0x80000000*(1000%TIMER_FREQ))/TIMER_FREQ)
 
-// === TYPEDEFS ===
-typedef struct sTimer {
-	 int	FiresAfter;
-	void	(*Callback)(void*);
-	void	*Argument;
-} tTimer;
+// === IMPORTS ===
+extern Sint64	giTimestamp;
+extern Uint64	giTicks;
+extern Uint64	giPartMiliseconds;
+extern void	Timer_CallTimers(void);
 
 // === PROTOTYPES ===
-void	Time_Interrupt();
-void	Timer_CallTimers();
-
-// === GLOBALS ===
-Uint64	giTicks = 0;
-Sint64	giTimestamp = 0;
-Uint64	giPartMiliseconds = 0;
-tTimer	gTimers[NUM_TIMERS];
+void	Time_Interrupt(int);
 
 // === CODE ===
 /**
- * \fn int Time_Setup()
+ * \fn int Time_Setup(void)
  * \brief Sets the system time from the Realtime-Clock
  */
-int Time_Setup()
+int Time_Setup(void)
 {
 	Uint8	val;
 	
+	Log_Log("Timer", "RTC Timer firing at %iHz (%i divisor), %i.0x%08x",
+		TIMER_FREQ, TIMER_RATE, MS_PER_TICK_WHOLE, MS_PER_TICK_FRACT);
+	
 	outb(0x70, inb(0x70)&0x7F);	// Disable NMIs
 	__asm__ __volatile__ ("cli");	// Disable normal interrupts
 	
@@ -56,20 +53,27 @@ int Time_Setup()
 	outb(0x70, 0x0B);	// Set the index again (a read will reset the index to register D)
 	outb(0x71, val | 0x40);	// Write the previous value or'd with 0x40. This turns on bit 6 of register D
 	
-	__asm__ __volatile__ ("sti");	// Disable normal interrupts
-	outb(0x70, inb(0x70)|0x80);	// Disable NMIs
+	__asm__ __volatile__ ("sti");	// Re-enable normal interrupts
+	outb(0x70, inb(0x70)|0x80);	// Re-enable NMIs
 	
 	// Install IRQ Handler
 	IRQ_AddHandler(8, Time_Interrupt);
+	
+	// Make sure the RTC actually fires
+	outb(0x70, 0x0C); // Select register C
+	inb(0x71);	// Just throw away contents.
+	
 	return 0;
 }
 
 /**
- * \fn void Time_Interrupt()
  * \brief Called on the timekeeping IRQ
+ * \param irq	IRQ number (unused)
  */
-void Time_Interrupt()
+void Time_Interrupt(int irq)
 {
+	//Log("RTC Tick");
+	
 	giTicks ++;
 	giTimestamp += MS_PER_TICK_WHOLE;
 	giPartMiliseconds += MS_PER_TICK_FRACT;
@@ -78,8 +82,6 @@ void Time_Interrupt()
 		giPartMiliseconds -= 0x80000000;
 	}
 	
-	//Log("giTimestamp = %lli", giTimestamp);
-	
 	Timer_CallTimers();
 
 	// Make sure the RTC Fires again
@@ -89,9 +91,9 @@ void Time_Interrupt()
 
 #if 0
 /**
- * \fn void Time_TimerThread()
+ * \fn void Time_TimerThread(void)
  */
-void Time_TimerThread()
+void Time_TimerThread(void)
 {
 	Sint64	next;
 	Threads_SetName("TIMER");
@@ -105,75 +107,3 @@ void Time_TimerThread()
 	}
 }
 #endif
-
-/**
- * \fn Sint64 now()
- * \brief Return the current timestamp
- */
-Sint64 now()
-{
-	return giTimestamp;
-}
-
-/**
- * \fn void Timer_CallTimers()
- */
-void Timer_CallTimers()
-{
-	 int	i;
-	void	(*callback)(void *);
-	
-	for(i = 0;
-		i < NUM_TIMERS;
-		i ++)
-	{
-		if(gTimers[i].Callback == NULL)	continue;
-		if(giTimestamp < gTimers[i].FiresAfter)	continue;
-		callback = gTimers[i].Callback;
-		gTimers[i].Callback = NULL;
-		callback(gTimers[i].Argument);
-	}
-}
-
-/**
- * \fn int Time_CreateTimer(int Delta, void *Callback, void *Argument)
- */
-int Time_CreateTimer(int Delta, void *Callback, void *Argument)
-{
-	 int	ret;
-	
-	if(Callback == NULL)	return -1;
-	
-	for(ret = 0;
-		ret < NUM_TIMERS;
-		ret++)
-	{
-		if(gTimers[ret].Callback != NULL)	continue;
-		gTimers[ret].Callback = Callback;
-		gTimers[ret].FiresAfter = giTimestamp + Delta;
-		gTimers[ret].Argument = Argument;
-		//Log("Callback = %p", Callback);
-		//Log("Timer %i fires at %lli", ret, gTimers[ret].FiresAfter);
-		return ret;
-	}
-	return -1;
-}
-
-/**
- * \fn void Time_RemoveTimer(int ID)
- */
-void Time_RemoveTimer(int ID)
-{
-	if(ID < 0 || ID >= NUM_TIMERS)	return;
-	gTimers[ID].Callback = NULL;
-}
-
-/**
- * \fn void Time_Delay(int Delay)
- * \brief Delay for a small ammount of time
- */
-void Time_Delay(int Delay)
-{
-	Sint64	dest = giTimestamp + Delay;
-	while(dest < giTimestamp)	Threads_Yield();
-}