From d94ffac4a584dc7a4f6f2ec567b8caab05ce9253 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Wed, 6 May 2020 19:04:05 +0200 Subject: New build parameters and shared includes This changes many files but I've just applied some replace commands.. So - nothing special! --- src/kernel/timer/timer.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/kernel/timer/timer.c') diff --git a/src/kernel/timer/timer.c b/src/kernel/timer/timer.c index 29017a5..dac1371 100644 --- a/src/kernel/timer/timer.c +++ b/src/kernel/timer/timer.c @@ -1,7 +1,7 @@ #include -#include -#include -#include +#include +#include +#include unsigned long timer_ticks = 0; @@ -9,8 +9,8 @@ void timer_phase(int hz) { int divisor = (int)(3579545.0 / 3.0 / (double)hz); outb(0x43, 0x36); // 01 10 11 0b // CTR, RW, MODE, BCD - outb(0x40, (uint8_t)(divisor & 0xFF)); - outb(0x40, (uint8_t)(divisor >> 8)); + outb(0x40, (u8)(divisor & 0xFF)); + outb(0x40, (u8)(divisor >> 8)); } // Executed 1000 times per second @@ -22,7 +22,7 @@ void timer_handler(struct regs *r) // "Delay" function with CPU sleep void timer_wait(int ticks) { - uint32_t eticks; + u32 eticks; eticks = timer_ticks + ticks; while (timer_ticks < eticks) { @@ -30,7 +30,7 @@ void timer_wait(int ticks) } } -uint32_t get_time() +u32 get_time() { return timer_ticks; } -- cgit v1.2.3