diff options
| author | Marvin Borner | 2020-07-28 22:06:43 +0200 |
|---|---|---|
| committer | Marvin Borner | 2020-07-28 22:06:43 +0200 |
| commit | 2218b243897843536c1191f268a91dcb0375d8ac (patch) | |
| tree | e50c940f4bee2f50df292a6e471c22a8084e2cf2 | |
| parent | 44fa7a529656c1ec8a445cac4ee7b40351a7c753 (diff) | |
Yay, timer works.
This confirms my assumption that the errors are the bootloaders fault by
not supporting indirect pointers.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | src/drivers/interrupts.c | 1 | ||||
| -rw-r--r-- | src/drivers/timer.c | 2 | ||||
| -rw-r--r-- | src/main.c | 4 |
4 files changed, 5 insertions, 4 deletions
@@ -8,6 +8,7 @@ COBJS = src/main.o \ src/drivers/interrupts_asm.o \ src/drivers/keyboard.o \ src/drivers/ide.o \ + src/drivers/timer.o \ src/features/fs.o \ src/features/psf.o \ src/features/gui.o \ @@ -20,6 +21,7 @@ CC = cross/opt/bin/i686-elf-gcc LD = cross/opt/bin/i686-elf-ld AS = nasm +# Flags to make the binary smaller TODO: Remove after indirect pointer support! CSFLAGS = -fno-stack-protector -fomit-frame-pointer -ffunction-sections -fdata-sections -Wl,--gc-sections -mpreferred-stack-boundary=2 -falign-functions=1 -falign-jumps=1 -falign-loops=1 -fno-unwind-tables -fno-asynchronous-unwind-tables -fno-math-errno -fno-unroll-loops -fmerge-all-constants -fno-ident -ffast-math # TODO: Use lib as external library diff --git a/src/drivers/interrupts.c b/src/drivers/interrupts.c index d65490c..dc031e0 100644 --- a/src/drivers/interrupts.c +++ b/src/drivers/interrupts.c @@ -190,5 +190,4 @@ void interrupts_install() idt_install(); isr_install(); irq_install(); - __asm__("sti"); } diff --git a/src/drivers/timer.c b/src/drivers/timer.c index 922b385..a3b4137 100644 --- a/src/drivers/timer.c +++ b/src/drivers/timer.c @@ -34,6 +34,6 @@ void timer_wait(u32 ticks) // Install timer handler into IRQ0 void timer_install() { - /* timer_phase(1000); */ + timer_phase(1000); irq_install_handler(0, timer_handler); } @@ -9,7 +9,7 @@ #include <keyboard.h> #include <print.h> #include <serial.h> -/* #include <timer.h> */ +#include <timer.h> u32 HEAP = 0x00200000; u32 HEAP_START; @@ -29,7 +29,7 @@ void main(struct mem_info *mem_info, struct vid_info *vid_info) // Install drivers interrupts_install(); - /* timer_install(); */ + timer_install(); keyboard_install(); // Enable drivers |