From 8527152156e1031bb3c1b20830216c6a65e20b79 Mon Sep 17 00:00:00 2001 From: Braiden Vasco Date: Thu, 9 Nov 2017 16:00:36 +0000 Subject: [PATCH] Remove directory "include" --- Makefile | 5 ++--- console.c | 2 +- info.c | 2 +- include/kernelmq/info.h => info.h | 0 init.c | 6 +++--- logger.c | 2 +- main.c | 4 ++-- include/kernelmq/module.h => module.h | 0 multiboot.c | 2 +- multiboot.h | 2 +- paging.c | 2 +- paging.h | 2 +- pfa.c | 2 +- pfa.h | 2 +- protected.c | 2 +- protected.h | 2 +- include/kernelmq/stdlib.h => stdlib.h | 0 syscall.c | 2 +- include/kernelmq/syscall.h => syscall.h | 0 tss.c | 2 +- tss.h | 2 +- 21 files changed, 21 insertions(+), 22 deletions(-) rename include/kernelmq/info.h => info.h (100%) rename include/kernelmq/module.h => module.h (100%) rename include/kernelmq/stdlib.h => stdlib.h (100%) rename include/kernelmq/syscall.h => syscall.h (100%) diff --git a/Makefile b/Makefile index 0cd2991..cb097b8 100644 --- a/Makefile +++ b/Makefile @@ -4,10 +4,9 @@ AR = $(CCPREFIX)ar AS = $(CCPREFIX)as CC = $(CCPREFIX)gcc -INCLUDE = include -KERNEL = rootfs/boot/kernelmq.multiboot2 +KERNEL = rootfs/boot/kernelmq.multiboot2 -CFLAGS = -std=gnu99 -ffreestanding -nostdinc -fno-builtin -fno-stack-protector -Wall -Wextra -I $(INCLUDE) +CFLAGS = -std=gnu99 -ffreestanding -nostdinc -fno-builtin -fno-stack-protector -Wall -Wextra IMAGE = image.iso diff --git a/console.c b/console.c index 8df6556..d6b7531 100644 --- a/console.c +++ b/console.c @@ -1,6 +1,6 @@ #include "console.h" -#include +#include "stdlib.h" static unsigned short *const console_buffer = (unsigned short*)0xB8000; diff --git a/info.c b/info.c index fa7ee08..4a29cf5 100644 --- a/info.c +++ b/info.c @@ -1,4 +1,4 @@ -#include +#include "info.h" static unsigned char cmdline_terminated(const char *s); diff --git a/include/kernelmq/info.h b/info.h similarity index 100% rename from include/kernelmq/info.h rename to info.h diff --git a/init.c b/init.c index 01a3fc0..dd4c58b 100644 --- a/init.c +++ b/init.c @@ -4,9 +4,9 @@ #include "protected.h" #include "paging.h" -#include -#include -#include +#include "info.h" +#include "stdlib.h" +#include "module.h" static struct KernelMQ_Info kinfo; diff --git a/logger.c b/logger.c index 67be995..efbc764 100644 --- a/logger.c +++ b/logger.c @@ -2,7 +2,7 @@ #include "console.h" -#include +#include "stdlib.h" #define LEVELS_COUNT 4 diff --git a/main.c b/main.c index 94910a9..1917bde 100644 --- a/main.c +++ b/main.c @@ -1,8 +1,8 @@ #include "multiboot.h" #include "paging.h" -#include -#include +#include "info.h" +#include "stdlib.h" // Defined in linker script extern char _kernel_offset; diff --git a/include/kernelmq/module.h b/module.h similarity index 100% rename from include/kernelmq/module.h rename to module.h diff --git a/multiboot.c b/multiboot.c index 842464a..e6a3e53 100644 --- a/multiboot.c +++ b/multiboot.c @@ -1,6 +1,6 @@ #include "multiboot.h" -#include +#include "stdlib.h" #define MULTIBOOT_TAG_TYPE_END 0 #define MULTIBOOT_TAG_TYPE_CMDLINE 1 diff --git a/multiboot.h b/multiboot.h index e36b3ca..f769558 100644 --- a/multiboot.h +++ b/multiboot.h @@ -1,7 +1,7 @@ #ifndef KERNELMQ_INCLUDED_MULTIBOOT #define KERNELMQ_INCLUDED_MULTIBOOT 1 -#include +#include "info.h" #define MULTIBOOT_MAGIC 0x36d76289 diff --git a/paging.c b/paging.c index 688bea4..60b6777 100644 --- a/paging.c +++ b/paging.c @@ -3,7 +3,7 @@ #include "pagedir.h" #include "panic.h" -#include +#include "stdlib.h" // CR0 bits #define I386_CR0_PE 0x00000001 // Protected mode diff --git a/paging.h b/paging.h index 34dc4ab..e06fb64 100644 --- a/paging.h +++ b/paging.h @@ -1,7 +1,7 @@ #ifndef KERNELMQ_INCLUDED_PAGING #define KERNELMQ_INCLUDED_PAGING 1 -#include +#include "info.h" void paging_enable(); diff --git a/pfa.c b/pfa.c index 6fd4ec8..d9c74c1 100644 --- a/pfa.c +++ b/pfa.c @@ -4,7 +4,7 @@ #include "panic.h" #include "logger.h" -#include +#include "stdlib.h" #define FRAMES_COUNT (PAGE_DIR_LENGTH * PAGE_TABLE_LENGTH) diff --git a/pfa.h b/pfa.h index dc49ede..70526b3 100644 --- a/pfa.h +++ b/pfa.h @@ -1,7 +1,7 @@ #ifndef KERNELMQ_INCLUDED_PFA #define KERNELMQ_INCLUDED_PFA 1 -#include +#include "info.h" void pfa_initialize(const struct KernelMQ_Info *kinfo); diff --git a/protected.c b/protected.c index 41d404b..95795bb 100644 --- a/protected.c +++ b/protected.c @@ -7,7 +7,7 @@ #include "tss.h" #include "pic.h" -#include +#include "stdlib.h" struct GdtPointer { unsigned short limit; diff --git a/protected.h b/protected.h index b40dcb5..50b84c6 100644 --- a/protected.h +++ b/protected.h @@ -1,7 +1,7 @@ #ifndef KERNELMQ_INCLUDED_PROTECTED #define KERNELMQ_INCLUDED_PROTECTED 1 -#include +#include "info.h" void protected_initialize(const struct KernelMQ_Info *kinfo); diff --git a/include/kernelmq/stdlib.h b/stdlib.h similarity index 100% rename from include/kernelmq/stdlib.h rename to stdlib.h diff --git a/syscall.c b/syscall.c index 8a21694..827cc7d 100644 --- a/syscall.c +++ b/syscall.c @@ -1,7 +1,7 @@ #include "interrupt.h" #include "logger.h" -#include +#include "syscall.h" static void syscall_do_exit(struct IsrRegisters regs); diff --git a/include/kernelmq/syscall.h b/syscall.h similarity index 100% rename from include/kernelmq/syscall.h rename to syscall.h diff --git a/tss.c b/tss.c index 6b5c898..0528f5f 100644 --- a/tss.c +++ b/tss.c @@ -2,7 +2,7 @@ #include "config.h" -#include +#include "stdlib.h" struct gdt_entry_bits { unsigned int limit_low : 16; diff --git a/tss.h b/tss.h index a63b9b5..30d882d 100644 --- a/tss.h +++ b/tss.h @@ -1,7 +1,7 @@ #ifndef KERNELMQ_INCLUDED_TSS #define KERNELMQ_INCLUDED_TSS 1 -#include +#include "info.h" void tss_write_to_gdt(const struct KernelMQ_Info *kinfo, void *gdt_entry);