From 6369c2977368e2a562501f64ed8cd8cf5371d152 Mon Sep 17 00:00:00 2001 From: Tom-on64 Date: Thu, 10 Oct 2024 09:48:54 +0200 Subject: [PATCH] Moved header files into their lib directory --- Makefile | 5 +++-- {include/libc => libc/include}/color.h | 0 {include/libc => libc/include}/math.h | 0 {include/libc => libc/include}/stdarg.h | 0 {include/libc => libc/include}/stdbool.h | 0 {include/libc => libc/include}/stddef.h | 0 {include/libc => libc/include}/stdint.h | 0 {include/libc => libc/include}/stdio.h | 0 {include/libc => libc/include}/stdlib.h | 0 {include/libc => libc/include}/string.h | 0 {include/libc => libc/include}/syscall.h | 0 {include/libc => libc/include}/time.h | 0 {include => libk/include}/disk/disk.h | 0 {include => libk/include}/error/bigerr.h | 0 {include => libk/include}/fs/fs.h | 0 {include => libk/include}/fs/impl.h | 0 {include => libk/include}/interrupt/exceptions.h | 0 {include => libk/include}/interrupt/idt.h | 0 {include => libk/include}/interrupt/pic.h | 0 {include => libk/include}/interrupt/pit.h | 0 {include => libk/include}/interrupt/rtc.h | 0 {include => libk/include}/interrupt/syscalls.h | 0 {include => libk/include}/keyboard/keyboard.h | 0 {include => libk/include}/keyboard/keys.h | 0 {include => libk/include}/memory/addresses.h | 0 {include => libk/include}/memory/malloc.h | 0 {include => libk/include}/memory/physical.h | 0 {include => libk/include}/memory/virtual.h | 0 {include => libk/include}/ports/io.h | 0 {include => libk/include}/ports/serial.h | 0 {include => libk/include}/screen/gfxmode.h | 0 {include => libk/include}/screen/graphics.h | 0 {include => libk/include}/screen/text.h | 0 {include => libk/include}/sound/notes.h | 0 {include => libk/include}/sound/pcspk.h | 0 {include => libk/include}/terminal/terminal.h | 0 36 files changed, 3 insertions(+), 2 deletions(-) rename {include/libc => libc/include}/color.h (100%) rename {include/libc => libc/include}/math.h (100%) rename {include/libc => libc/include}/stdarg.h (100%) rename {include/libc => libc/include}/stdbool.h (100%) rename {include/libc => libc/include}/stddef.h (100%) rename {include/libc => libc/include}/stdint.h (100%) rename {include/libc => libc/include}/stdio.h (100%) rename {include/libc => libc/include}/stdlib.h (100%) rename {include/libc => libc/include}/string.h (100%) rename {include/libc => libc/include}/syscall.h (100%) rename {include/libc => libc/include}/time.h (100%) rename {include => libk/include}/disk/disk.h (100%) rename {include => libk/include}/error/bigerr.h (100%) rename {include => libk/include}/fs/fs.h (100%) rename {include => libk/include}/fs/impl.h (100%) rename {include => libk/include}/interrupt/exceptions.h (100%) rename {include => libk/include}/interrupt/idt.h (100%) rename {include => libk/include}/interrupt/pic.h (100%) rename {include => libk/include}/interrupt/pit.h (100%) rename {include => libk/include}/interrupt/rtc.h (100%) rename {include => libk/include}/interrupt/syscalls.h (100%) rename {include => libk/include}/keyboard/keyboard.h (100%) rename {include => libk/include}/keyboard/keys.h (100%) rename {include => libk/include}/memory/addresses.h (100%) rename {include => libk/include}/memory/malloc.h (100%) rename {include => libk/include}/memory/physical.h (100%) rename {include => libk/include}/memory/virtual.h (100%) rename {include => libk/include}/ports/io.h (100%) rename {include => libk/include}/ports/serial.h (100%) rename {include => libk/include}/screen/gfxmode.h (100%) rename {include => libk/include}/screen/graphics.h (100%) rename {include => libk/include}/screen/text.h (100%) rename {include => libk/include}/sound/notes.h (100%) rename {include => libk/include}/sound/pcspk.h (100%) rename {include => libk/include}/terminal/terminal.h (100%) diff --git a/Makefile b/Makefile index e488f9f..872298d 100644 --- a/Makefile +++ b/Makefile @@ -12,8 +12,8 @@ include make.config SRC := ./src BIN := ./bin -LIBK_INC := ./include -LIBC_INC := ./include/libc +LIBK_INC := ./libk/include +LIBC_INC := ./libc/include LIBC_DIR := ./libc LIBK_DIR := ./libk LIBK_SRC := $(shell find $(LIBK_DIR) -type f -name "**.c") @@ -92,6 +92,7 @@ run: # Clean all build files clean: + rm -f kern.iso rm -rf $(BIN) rm -f makedisk diff --git a/include/libc/color.h b/libc/include/color.h similarity index 100% rename from include/libc/color.h rename to libc/include/color.h diff --git a/include/libc/math.h b/libc/include/math.h similarity index 100% rename from include/libc/math.h rename to libc/include/math.h diff --git a/include/libc/stdarg.h b/libc/include/stdarg.h similarity index 100% rename from include/libc/stdarg.h rename to libc/include/stdarg.h diff --git a/include/libc/stdbool.h b/libc/include/stdbool.h similarity index 100% rename from include/libc/stdbool.h rename to libc/include/stdbool.h diff --git a/include/libc/stddef.h b/libc/include/stddef.h similarity index 100% rename from include/libc/stddef.h rename to libc/include/stddef.h diff --git a/include/libc/stdint.h b/libc/include/stdint.h similarity index 100% rename from include/libc/stdint.h rename to libc/include/stdint.h diff --git a/include/libc/stdio.h b/libc/include/stdio.h similarity index 100% rename from include/libc/stdio.h rename to libc/include/stdio.h diff --git a/include/libc/stdlib.h b/libc/include/stdlib.h similarity index 100% rename from include/libc/stdlib.h rename to libc/include/stdlib.h diff --git a/include/libc/string.h b/libc/include/string.h similarity index 100% rename from include/libc/string.h rename to libc/include/string.h diff --git a/include/libc/syscall.h b/libc/include/syscall.h similarity index 100% rename from include/libc/syscall.h rename to libc/include/syscall.h diff --git a/include/libc/time.h b/libc/include/time.h similarity index 100% rename from include/libc/time.h rename to libc/include/time.h diff --git a/include/disk/disk.h b/libk/include/disk/disk.h similarity index 100% rename from include/disk/disk.h rename to libk/include/disk/disk.h diff --git a/include/error/bigerr.h b/libk/include/error/bigerr.h similarity index 100% rename from include/error/bigerr.h rename to libk/include/error/bigerr.h diff --git a/include/fs/fs.h b/libk/include/fs/fs.h similarity index 100% rename from include/fs/fs.h rename to libk/include/fs/fs.h diff --git a/include/fs/impl.h b/libk/include/fs/impl.h similarity index 100% rename from include/fs/impl.h rename to libk/include/fs/impl.h diff --git a/include/interrupt/exceptions.h b/libk/include/interrupt/exceptions.h similarity index 100% rename from include/interrupt/exceptions.h rename to libk/include/interrupt/exceptions.h diff --git a/include/interrupt/idt.h b/libk/include/interrupt/idt.h similarity index 100% rename from include/interrupt/idt.h rename to libk/include/interrupt/idt.h diff --git a/include/interrupt/pic.h b/libk/include/interrupt/pic.h similarity index 100% rename from include/interrupt/pic.h rename to libk/include/interrupt/pic.h diff --git a/include/interrupt/pit.h b/libk/include/interrupt/pit.h similarity index 100% rename from include/interrupt/pit.h rename to libk/include/interrupt/pit.h diff --git a/include/interrupt/rtc.h b/libk/include/interrupt/rtc.h similarity index 100% rename from include/interrupt/rtc.h rename to libk/include/interrupt/rtc.h diff --git a/include/interrupt/syscalls.h b/libk/include/interrupt/syscalls.h similarity index 100% rename from include/interrupt/syscalls.h rename to libk/include/interrupt/syscalls.h diff --git a/include/keyboard/keyboard.h b/libk/include/keyboard/keyboard.h similarity index 100% rename from include/keyboard/keyboard.h rename to libk/include/keyboard/keyboard.h diff --git a/include/keyboard/keys.h b/libk/include/keyboard/keys.h similarity index 100% rename from include/keyboard/keys.h rename to libk/include/keyboard/keys.h diff --git a/include/memory/addresses.h b/libk/include/memory/addresses.h similarity index 100% rename from include/memory/addresses.h rename to libk/include/memory/addresses.h diff --git a/include/memory/malloc.h b/libk/include/memory/malloc.h similarity index 100% rename from include/memory/malloc.h rename to libk/include/memory/malloc.h diff --git a/include/memory/physical.h b/libk/include/memory/physical.h similarity index 100% rename from include/memory/physical.h rename to libk/include/memory/physical.h diff --git a/include/memory/virtual.h b/libk/include/memory/virtual.h similarity index 100% rename from include/memory/virtual.h rename to libk/include/memory/virtual.h diff --git a/include/ports/io.h b/libk/include/ports/io.h similarity index 100% rename from include/ports/io.h rename to libk/include/ports/io.h diff --git a/include/ports/serial.h b/libk/include/ports/serial.h similarity index 100% rename from include/ports/serial.h rename to libk/include/ports/serial.h diff --git a/include/screen/gfxmode.h b/libk/include/screen/gfxmode.h similarity index 100% rename from include/screen/gfxmode.h rename to libk/include/screen/gfxmode.h diff --git a/include/screen/graphics.h b/libk/include/screen/graphics.h similarity index 100% rename from include/screen/graphics.h rename to libk/include/screen/graphics.h diff --git a/include/screen/text.h b/libk/include/screen/text.h similarity index 100% rename from include/screen/text.h rename to libk/include/screen/text.h diff --git a/include/sound/notes.h b/libk/include/sound/notes.h similarity index 100% rename from include/sound/notes.h rename to libk/include/sound/notes.h diff --git a/include/sound/pcspk.h b/libk/include/sound/pcspk.h similarity index 100% rename from include/sound/pcspk.h rename to libk/include/sound/pcspk.h diff --git a/include/terminal/terminal.h b/libk/include/terminal/terminal.h similarity index 100% rename from include/terminal/terminal.h rename to libk/include/terminal/terminal.h