X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Kernel%2Farch%2Fx86%2Ftime.c;h=d4bda951e4270fdf04e343e4c08e3e2d171f0085;hb=dcebc16c576aa98eb6a33047f4c4b2b69b30a1bc;hp=22ea6181e45bbbcfbbbb6be36eca6b094eb28656;hpb=9d85201216cb35e1b1e051b1d7cdc38eaa5befa4;p=tpg%2Facess2.git diff --git a/Kernel/arch/x86/time.c b/Kernel/arch/x86/time.c index 22ea6181..d4bda951 100644 --- a/Kernel/arch/x86/time.c +++ b/Kernel/arch/x86/time.c @@ -30,7 +30,7 @@ volatile Uint64 giTime_TSCPerTick = 0; // === PROTOTYPES === //Sint64 now(void); int Time_Setup(void); -void Time_Interrupt(int); +void Time_Interrupt(int IRQ, void *Ptr); Uint64 Time_ReadTSC(void); // === CODE === @@ -83,7 +83,7 @@ int Time_Setup(void) outb(0x70, inb(0x70)|0x80); // Re-enable NMIs // Install IRQ Handler - IRQ_AddHandler(8, Time_Interrupt); + IRQ_AddHandler(8, Time_Interrupt, NULL); // Make sure the RTC actually fires outb(0x70, 0x0C); // Select register C @@ -96,7 +96,7 @@ int Time_Setup(void) * \brief Called on the timekeeping IRQ * \param irq IRQ number (unused) */ -void Time_Interrupt(int irq) +void Time_Interrupt(int IRQ, void *Ptr) { //Log("RTC Tick"); Uint64 curTSC = Time_ReadTSC();