Big Changes - See commit details

[tpg/acess2.git] / Kernel / arch / x86 / time.c

diff --git a/Kernel/arch/x86/time.c b/Kernel/arch/x86/time.c
index 9248bd1..abdbb11 100644 (file)
--- a/Kernel/arch/x86/time.c
+++ b/Kernel/arch/x86/time.c
@@ -8,7 +8,8 @@
 // === MACROS ===
 #define        NUM_TIMERS      8
 #define        TIMER_QUANTUM   100
-#define TIMER_FREQ     1024    //Hz
+#define TIMER_RATE     13      // (Max: 15, Min: 2) - 15 = 1Hz, 13 = 4Hz, 10 = 1024Hz
+#define TIMER_FREQ     (32768>>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))
 
@@ -41,6 +42,14 @@ int Time_Setup()
        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
@@ -78,10 +87,10 @@ void Time_Interrupt()
        inb(0x71);      // Just throw away contents.
 }
 
+#if 0
 /**
  * \fn void Time_TimerThread()
  */
-#if 0
 void Time_TimerThread()
 {
        Sint64  next;
@@ -118,9 +127,7 @@ void Timer_CallTimers()
                i < NUM_TIMERS;
                i ++)
        {
-               //Log("Timer %i", i);
                if(gTimers[i].Callback == NULL) continue;
-               Log("%i - %lli < %lli", i, giTimestamp, gTimers[i].FiresAfter);
                if(giTimestamp < gTimers[i].FiresAfter) continue;
                callback = gTimers[i].Callback;
                gTimers[i].Callback = NULL;
@@ -145,8 +152,8 @@ int Time_CreateTimer(int Delta, void *Callback, void *Argument)
                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);
+               //Log("Callback = %p", Callback);
+               //Log("Timer %i fires at %lli", ret, gTimers[ret].FiresAfter);
                return ret;
        }
        return -1;
@@ -170,3 +177,9 @@ void Time_Delay(int Delay)
        Sint64  dest = giTimestamp + Delay;
        while(dest < giTimestamp)       Threads_Yield();
 }
+
+// === EXPORTS ===
+EXPORT(now);
+EXPORT(Time_CreateTimer);
+EXPORT(Time_RemoveTimer);
+EXPORT(Time_Delay);