diff --git a/.vscode/settings.json b/.vscode/settings.json index ac1b53cc..eb3723e9 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -102,7 +102,8 @@ "wait_queue.h": "c", "stddef.h": "c", "spinlock.h": "c", - "stat.h": "c" + "stat.h": "c", + "video.h": "c" }, "C_Cpp.errorSquiggles": "Enabled", "esbonio.sphinx.confDir": "" diff --git a/kernel/Makefile b/kernel/Makefile index 653e2e6d..b06ebed3 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -18,7 +18,7 @@ LD_LIST := head.o OBJ_LIST := head.o -kernel_subdirs := common driver process debug filesystem +kernel_subdirs := common driver process debug filesystem time @@ -125,8 +125,6 @@ rtc.o: driver/timers/rtc/rtc.c HPET.o: driver/timers/HPET/HPET.c gcc $(CFLAGS) -c driver/timers/HPET/HPET.c -o driver/timers/HPET/HPET.o -timer.o: driver/timers/timer.c - gcc $(CFLAGS) -c driver/timers/timer.c -o driver/timers/timer.o OBJ_LIST += uart.o LD_LIST += driver/uart/uart.o @@ -156,7 +154,7 @@ all: kernel echo "Done." -kernel: head.o entry.o main.o printk.o trap.o mm.o slab.o irq.o pic.o sched.o syscall.o multiboot2.o cpu.o acpi.o ps2_keyboard.o ps2_mouse.o ata.o pci.o ahci.o smp.o apu_boot.o rtc.o HPET.o softirq.o timer.o $(OBJ_LIST) +kernel: head.o entry.o main.o printk.o trap.o mm.o slab.o irq.o pic.o sched.o syscall.o multiboot2.o cpu.o acpi.o ps2_keyboard.o ps2_mouse.o ata.o pci.o ahci.o smp.o apu_boot.o rtc.o HPET.o softirq.o $(OBJ_LIST) @list='$(kernel_subdirs)'; for subdir in $$list; do \ echo "make all in $$subdir";\ diff --git a/kernel/driver/timers/HPET/HPET.c b/kernel/driver/timers/HPET/HPET.c index 6ab3fb48..118b3c89 100644 --- a/kernel/driver/timers/HPET/HPET.c +++ b/kernel/driver/timers/HPET/HPET.c @@ -3,7 +3,7 @@ #include #include #include -#include +#include