git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improved user error handling, now a user DIV0 doesn't cause a kernel
[tpg/acess2.git]
/
Kernel
/
arch
/
x86
/
time.c
diff --git
a/Kernel/arch/x86/time.c
b/Kernel/arch/x86/time.c
index
f7d02cc
..
cdf2370
100644
(file)
--- a/
Kernel/arch/x86/time.c
+++ b/
Kernel/arch/x86/time.c
@@
-3,12
+3,14
@@
* Timekeeping
* arch/x86/time.c
*/
* Timekeeping
* arch/x86/time.c
*/
-#include <
common
.h>
+#include <
acess
.h>
// === MACROS ===
#define NUM_TIMERS 8
#define TIMER_QUANTUM 100
// === 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))
#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
+43,14
@@
int Time_Setup()
outb(0x70, inb(0x70)&0x7F); // Disable NMIs
__asm__ __volatile__ ("cli"); // Disable normal interrupts
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
// Enable IRQ8
outb(0x70, 0x0B); // Set the index to register B
val = inb(0x71); // Read the current value of register B
@@
-69,13
+79,19
@@
void Time_Interrupt()
giPartMiliseconds -= 0x80000000;
}
giPartMiliseconds -= 0x80000000;
}
+ //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()
*/
/**
* \fn void Time_TimerThread()
*/
-#if 0
void Time_TimerThread()
{
Sint64 next;
void Time_TimerThread()
{
Sint64 next;
@@
-126,6
+142,9
@@
void Timer_CallTimers()
int Time_CreateTimer(int Delta, void *Callback, void *Argument)
{
int ret;
int Time_CreateTimer(int Delta, void *Callback, void *Argument)
{
int ret;
+
+ if(Callback == NULL) return -1;
+
for(ret = 0;
ret < NUM_TIMERS;
ret++)
for(ret = 0;
ret < NUM_TIMERS;
ret++)
@@
-134,6
+153,8
@@
int Time_CreateTimer(int Delta, void *Callback, void *Argument)
gTimers[ret].Callback = Callback;
gTimers[ret].FiresAfter = giTimestamp + Delta;
gTimers[ret].Argument = 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);
return ret;
}
return -1;
return ret;
}
return -1;
@@
-157,3
+178,9
@@
void Time_Delay(int Delay)
Sint64 dest = giTimestamp + Delay;
while(dest < giTimestamp) Threads_Yield();
}
Sint64 dest = giTimestamp + Delay;
while(dest < giTimestamp) Threads_Yield();
}
+
+// === EXPORTS ===
+EXPORT(now);
+EXPORT(Time_CreateTimer);
+EXPORT(Time_RemoveTimer);
+EXPORT(Time_Delay);
UCC
git Repository :: git.ucc.asn.au