diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/kernel.c | 6 | ||||
| -rw-r--r-- | src/mem/vmm.c | 2 | ||||
| -rw-r--r-- | src/mmap.h | 2 |
4 files changed, 4 insertions, 8 deletions
diff --git a/src/Makefile b/src/Makefile index f58ec04..de59cfb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,7 +1,5 @@ include ../Makefile.config -CCFLAGS += -I. -isystem../grub/include -I../${ARCH} -I../lib -I.. - kernel.SRCS := multiboot2.c mmap.c kernel.c mem/vmm.c kernel.OBJS := conf.h diff --git a/src/kernel.c b/src/kernel.c index a315f3b..b8432a8 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -4,14 +4,14 @@ // description: kernel entry point //===================================================================== +#include "conf.h" #include "devices/keyboard.h" #include "devices/mouse.h" #include "devices/pic.h" #include "devices/ps2_controller.h" -#include "devices/uart_16550.h" +#include "devices/uart.h" #include "devices/vga.h" #include "mem.h" -#include <conf.h> #include <stdio.h> #include <sys/cpuid.h> @@ -50,7 +50,5 @@ void kmain() { if (*c == 0) printf("c is 0\r\n"); */ - // asm volatile("int $0x80"); - while (1) {} } diff --git a/src/mem/vmm.c b/src/mem/vmm.c index 431f0df..3d34a0a 100644 --- a/src/mem/vmm.c +++ b/src/mem/vmm.c @@ -1,5 +1,5 @@ #include "../mem.h" -#include "paging.h" +#include <arch/paging.h> extern struct DirectoryEntry k_pagedir[1024]; extern struct TableEntry k_ptable0x300[1024]; @@ -1,7 +1,7 @@ #pragma once #include "boot.h" -#include <multiboot2.h> +#include <grub/multiboot2.h> __attribute__((section(".multiboot.text"))) unsigned multiboot2_mmap(const struct multiboot_mmap_entry entries[], unsigned entry_count, unsigned bitmap[1024 * 32]); |