From ff2f738b02b699d82f6da39d79a036ff649f4e85 Mon Sep 17 00:00:00 2001 From: Tom-on64 Date: Sat, 19 Oct 2024 16:21:29 +0200 Subject: [PATCH] Minor changes --- kern.img | Bin 1470464 -> 1470464 bytes kernel/kernel.c | 2 +- libc/include/color.h | 15 --------------- todo.txt | 18 ++++++++++-------- 4 files changed, 11 insertions(+), 24 deletions(-) delete mode 100644 libc/include/color.h diff --git a/kern.img b/kern.img index 835c4c9c6c64fe1c2c1c0f4f07ff145e20e27130..fa2b04df545b7a6d2d95651450e655e36e9e4a0d 100644 GIT binary patch delta 7074 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 I_JkMw4^`gH*#H0l delta 6875 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 BxSRk0 diff --git a/kernel/kernel.c b/kernel/kernel.c index 4f880e0..b77af8e 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #define PROMPT "#>" diff --git a/libc/include/color.h b/libc/include/color.h deleted file mode 100644 index b303c8f..0000000 --- a/libc/include/color.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef COLOR_H -#define COLOR_H - -#define BLACK 0x00000000 // 0 -#define RED 0x00ff0000 // 1 -#define GREEN 0x0000ff00 // 2 -#define YELLOW 0x00ffff00 // 3 -#define BLUE 0x000000ff // 4 -#define MAGENTA 0x00ff00ff // 5 -#define CYAN 0x0000ffff // 6 -#define WHITE 0x00ffffff // 7 - -uint32_t codeToColor(uint8_t code); - -#endif diff --git a/todo.txt b/todo.txt index 50fe671..0b1f0ca 100644 --- a/todo.txt +++ b/todo.txt @@ -36,18 +36,20 @@ Legend: - [ ] complex.h (idk why we would need this) - [x] ctype.h - [x] errno.h - - [ ] fcntl.h - [ ] float.h - - [ ] limits.h - - [ ] locale.h + - [x] limits.h - [ ] math.h - - [ ] setjmp.h + - [ ] tgmath.h (if we want type generic) + - [x] setjmp.h (this plagues my mind) - [ ] signal.h (we would need signals first) - - [ ] stdarg.h - - [ ] stddef.h - - [ ] stdint.h + - [x] stdarg.h + - [x] stdbool.h + - [x] stddef.h + - [x] stdint.h - [ ] stdio.h - - [ ] syscall.h + - [ ] stdlib.h + - [x] string.h + - [x] syscall.h - [ ] time.h - [ ] unistd.h (do we do POSIX?) - [ ] wchar.h (we would need text support for wide chars ig?)