From d24f83b493c16387861e786a8c37b122deb905ad Mon Sep 17 00:00:00 2001 From: Arnau478 Date: Sun, 19 Jun 2022 19:17:15 +0200 Subject: [PATCH] Moved stdio.h into lib/ --- src/kernel/arch/i686/isr.c | 2 +- src/kernel/drivers/keyboard.c | 4 ++-- src/kernel/drivers/timer.c | 2 +- src/kernel/{ => lib}/stdio.c | 2 +- src/kernel/{ => lib}/stdio.h | 0 src/kernel/main.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename src/kernel/{ => lib}/stdio.c (98%) rename src/kernel/{ => lib}/stdio.h (100%) diff --git a/src/kernel/arch/i686/isr.c b/src/kernel/arch/i686/isr.c index b6d822b..8b96033 100644 --- a/src/kernel/arch/i686/isr.c +++ b/src/kernel/arch/i686/isr.c @@ -1,6 +1,6 @@ #include #include "isr.h" -#include "../../stdio.h" +#include "../../lib/stdio.h" #include "idt.h" #include "io.h" #include "pic.h" diff --git a/src/kernel/drivers/keyboard.c b/src/kernel/drivers/keyboard.c index 5b3e3f8..3e5ea19 100644 --- a/src/kernel/drivers/keyboard.c +++ b/src/kernel/drivers/keyboard.c @@ -1,9 +1,9 @@ #include "../util/string.h" #include "keyboard.h" #include "../arch/i686/isr.h" -#include "../stdio.h" +#include "../lib/stdio.h" #include "../arch/i686/io.h" -#include "../stdio.h" +#include "../lib/stdio.h" static char g_key_buffer[256]; diff --git a/src/kernel/drivers/timer.c b/src/kernel/drivers/timer.c index 0ba756f..c7edd41 100644 --- a/src/kernel/drivers/timer.c +++ b/src/kernel/drivers/timer.c @@ -1,6 +1,6 @@ #include "timer.h" #include "../arch/i686/isr.h" -#include "../stdio.h" +#include "../lib/stdio.h" static void timer_handler(registers *regs){ //printf("TICK\n"); diff --git a/src/kernel/stdio.c b/src/kernel/lib/stdio.c similarity index 98% rename from src/kernel/stdio.c rename to src/kernel/lib/stdio.c index 8a21dc0..fd490e5 100644 --- a/src/kernel/stdio.c +++ b/src/kernel/lib/stdio.c @@ -1,7 +1,7 @@ #include #include #include "stdio.h" -#include "drivers/vga.h" +#include "../drivers/vga.h" static char g_HexChars[] = "0123456789abcdef"; diff --git a/src/kernel/stdio.h b/src/kernel/lib/stdio.h similarity index 100% rename from src/kernel/stdio.h rename to src/kernel/lib/stdio.h diff --git a/src/kernel/main.c b/src/kernel/main.c index e3e149a..fbe0f93 100644 --- a/src/kernel/main.c +++ b/src/kernel/main.c @@ -1,5 +1,5 @@ #include -#include "stdio.h" +#include "lib/stdio.h" #include "hal/hal.h" #include "drivers/timer.h" #include "drivers/keyboard.h"