* 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
+#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))
//Log("giTimestamp = %lli", giTimestamp);
- //Timer_CallTimers();
+ 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()
*/
-#if 0
void Time_TimerThread()
{
Sint64 next;
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;
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;
Sint64 dest = giTimestamp + Delay;
while(dest < giTimestamp) Threads_Yield();
}
+
+// === EXPORTS ===
+EXPORT(now);
+EXPORT(Time_CreateTimer);
+EXPORT(Time_RemoveTimer);
+EXPORT(Time_Delay);