X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Ftime.c;h=77683b558ef3d409a2a5d91bf3cbaca21b8fabe7;hb=4b80e9762374558077e28e321d75029645529a45;hp=f7d02cc10d3f32b1ac5396a7962156b30487f7d6;hpb=49337730d17bb690fef6fc4429b25b84e6a44479;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/time.c b/Kernel/arch/x86/time.c
index f7d02cc1..77683b55 100644
--- a/Kernel/arch/x86/time.c
+++ b/Kernel/arch/x86/time.c
@@ -3,44 +3,45 @@
  * Timekeeping
  * arch/x86/time.c
  */
-#include <common.h>
+#include <acess.h>
 
 // === MACROS ===
-#define	NUM_TIMERS	8
 #define	TIMER_QUANTUM	100
-#define TIMER_FREQ	1024	//Hz
+// 2^(15-rate), 15: 1HZ, 5: 1024Hz, 2: 8192Hz
+#define TIMER_RATE	12	// (Max: 15, Min: 2) - 15 = 1Hz, 13 = 4Hz, 12 = 8Hz, 11 = 16Hz 10 = 32Hz, 2
+#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))
 
-// === 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;
 	
 	outb(0x70, inb(0x70)&0x7F);	// Disable NMIs
 	__asm__ __volatile__ ("cli");	// Disable normal interrupts
 	
+	// Set IRQ8 firing rate
+	outb(0x70, 0x0A);	// Set the index to register A
+	val = inb(0x71); // Get the current value of register A
+	outb(0x70, 0x0A); // Reset index to A
+	val &= 0xF0;
+	val |= TIMER_RATE;
+	outb(0x71, val);	// Update the timer rate
+		
 	// Enable IRQ8
 	outb(0x70, 0x0B);	// Set the index to register B
 	val = inb(0x71);	// Read the current value of register B
@@ -56,10 +57,10 @@ int Time_Setup()
 }
 
 /**
- * \fn void Time_Interrupt()
+ * \fn void Time_Interrupt(void)
  * \brief Called on the timekeeping IRQ
  */
-void Time_Interrupt()
+void Time_Interrupt(int irq)
 {
 	giTicks ++;
 	giTimestamp += MS_PER_TICK_WHOLE;
@@ -70,13 +71,17 @@ void Time_Interrupt()
 	}
 	
 	Timer_CallTimers();
+
+	// Make sure the RTC Fires again
+	outb(0x70, 0x0C); // Select register C
+	inb(0x71);	// Just throw away contents.
 }
 
+#if 0
 /**
- * \fn void Time_TimerThread()
+ * \fn void Time_TimerThread(void)
  */
-#if 0
-void Time_TimerThread()
+void Time_TimerThread(void)
 {
 	Sint64	next;
 	Threads_SetName("TIMER");
@@ -90,70 +95,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;
-	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;
-		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();
-}