From fd9f4bd7724b4440bede4ccbb3670e88289402d9 Mon Sep 17 00:00:00 2001 From: Carlos Maiolino Date: Sat, 26 Jul 2025 15:27:23 +0200 Subject: Move include files to a subdirectory Move the include files to the toxic/ subdirectory, so it gets a bit more organized. Ah, yeah, OS name will be renamed to ToxicOS Signed-off-by: Carlos Maiolino --- src/include/kernel.h | 6 ------ src/include/toxic/kernel.h | 6 ++++++ src/include/toxic/string.h | 10 ++++++++++ src/include/toxic/vga.h | 25 +++++++++++++++++++++++++ src/include/vga.h | 25 ------------------------- src/kernel.c | 7 ++++--- src/lib/string.h | 9 --------- src/vga.c | 4 ++-- 8 files changed, 47 insertions(+), 45 deletions(-) delete mode 100644 src/include/kernel.h create mode 100644 src/include/toxic/kernel.h create mode 100644 src/include/toxic/string.h create mode 100644 src/include/toxic/vga.h delete mode 100644 src/include/vga.h delete mode 100644 src/lib/string.h (limited to 'src') diff --git a/src/include/kernel.h b/src/include/kernel.h deleted file mode 100644 index 2007693..0000000 --- a/src/include/kernel.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef KERNEL_H -#define KERNEL_H - -void kernel_main(); - -#endif /* KERNEL_H */ diff --git a/src/include/toxic/kernel.h b/src/include/toxic/kernel.h new file mode 100644 index 0000000..2007693 --- /dev/null +++ b/src/include/toxic/kernel.h @@ -0,0 +1,6 @@ +#ifndef KERNEL_H +#define KERNEL_H + +void kernel_main(); + +#endif /* KERNEL_H */ diff --git a/src/include/toxic/string.h b/src/include/toxic/string.h new file mode 100644 index 0000000..69d8bd2 --- /dev/null +++ b/src/include/toxic/string.h @@ -0,0 +1,10 @@ +#ifndef STRING_H +#define STRING_H + +#include + +size_t strlen(const char *s); +char *strcpy(char *restrict dst, const char *restrict src); + +void *memset(void *s, int c, size_t n); +#endif /* STRING_H */ diff --git a/src/include/toxic/vga.h b/src/include/toxic/vga.h new file mode 100644 index 0000000..7aaa210 --- /dev/null +++ b/src/include/toxic/vga.h @@ -0,0 +1,25 @@ +#ifndef VGA_H +#define VGA_H +#include + +#define VGA_ADDRESS 0xb8000 +#define VGA_WIDTH 80 +#define VGA_HEIGHT 20 + +struct vga_display { + uint16_t *buf; + uint16_t color; + size_t row; + size_t col; +}; + +extern struct vga_display display; + +void vga_put_char(size_t row, size_t col, char c, uint16_t color); +void vga_write_char(char c); +void vprintl(char *str); + +void init_display(uint16_t color); + + +#endif /* VGA_H */ diff --git a/src/include/vga.h b/src/include/vga.h deleted file mode 100644 index 7aaa210..0000000 --- a/src/include/vga.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef VGA_H -#define VGA_H -#include - -#define VGA_ADDRESS 0xb8000 -#define VGA_WIDTH 80 -#define VGA_HEIGHT 20 - -struct vga_display { - uint16_t *buf; - uint16_t color; - size_t row; - size_t col; -}; - -extern struct vga_display display; - -void vga_put_char(size_t row, size_t col, char c, uint16_t color); -void vga_write_char(char c); -void vprintl(char *str); - -void init_display(uint16_t color); - - -#endif /* VGA_H */ diff --git a/src/kernel.c b/src/kernel.c index bca7849..0aa8eef 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -1,11 +1,12 @@ -#include #include #include -#include -#include "lib/string.h" +#include +#include +#include void start_kernel() { init_display(2); vprintl("Hello World!!!\n"); + } diff --git a/src/lib/string.h b/src/lib/string.h deleted file mode 100644 index 72585ac..0000000 --- a/src/lib/string.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef STRING_H -#define STRING_H - -#include - -size_t strlen(const char *s); -char *strcpy(char *restrict dst, const char *restrict src); - -#endif /* STRING_H */ diff --git a/src/vga.c b/src/vga.c index 52109c6..276c9c4 100644 --- a/src/vga.c +++ b/src/vga.c @@ -1,7 +1,7 @@ #include #include -#include -#include "lib/string.h" +#include +#include struct vga_display display; -- cgit v1.2.3