From 9413809a49dba99c1f8da73b1bda8dc2cd5446ca Mon Sep 17 00:00:00 2001 From: dzwdz Date: Sat, 2 Oct 2021 19:22:15 +0000 Subject: rename kernel/arch/log.h to io.h it's not related to logging but to general io, the old name didn't make sense --- src/kernel/arch/generic.h | 2 +- src/kernel/arch/i386/interrupts/isr.c | 2 +- src/kernel/arch/i386/tty/tty.c | 2 +- src/kernel/arch/io.h | 29 +++++++++++++++++++++++++++++ src/kernel/arch/log.h | 29 ----------------------------- 5 files changed, 32 insertions(+), 32 deletions(-) create mode 100644 src/kernel/arch/io.h delete mode 100644 src/kernel/arch/log.h (limited to 'src/kernel/arch') diff --git a/src/kernel/arch/generic.h b/src/kernel/arch/generic.h index e5ececd..bbbb49f 100644 --- a/src/kernel/arch/generic.h +++ b/src/kernel/arch/generic.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/kernel/arch/i386/interrupts/isr.c b/src/kernel/arch/i386/interrupts/isr.c index 1ca6da9..dacecba 100644 --- a/src/kernel/arch/i386/interrupts/isr.c +++ b/src/kernel/arch/i386/interrupts/isr.c @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include diff --git a/src/kernel/arch/i386/tty/tty.c b/src/kernel/arch/i386/tty/tty.c index b469285..bae65c5 100644 --- a/src/kernel/arch/i386/tty/tty.c +++ b/src/kernel/arch/i386/tty/tty.c @@ -1,6 +1,6 @@ #include #include -#include +#include void tty_init(void) { vga_clear(); diff --git a/src/kernel/arch/io.h b/src/kernel/arch/io.h new file mode 100644 index 0000000..ef8cb17 --- /dev/null +++ b/src/kernel/arch/io.h @@ -0,0 +1,29 @@ +#pragma once +#include + +void tty_init(void); +void tty_write(const char *buf, size_t len); + +static inline void _tty_hex(const char *buf, size_t len) { + char hex[2]; + for (size_t i = 0; i < len; i++) { + hex[0] = (buf[i] & 0xF0) >> 4; + hex[0] += '0'; + if (hex[0] > '9') + hex[0] += 'a' - '9' - 1; + + hex[1] = buf[i] & 0xF; + hex[1] += '0'; + if (hex[1] > '9') + hex[1] += 'a' - '9' - 1; + + tty_write(hex, 2); + } +} + +// used for static strings +#define tty_const(str) tty_write(str, sizeof(str) - 1) + +// very hacky, shouldn't be actually used - only for debugging +// prints backwards +#define _tty_var(var) _tty_hex((void*)&var, sizeof(var)) diff --git a/src/kernel/arch/log.h b/src/kernel/arch/log.h deleted file mode 100644 index ef8cb17..0000000 --- a/src/kernel/arch/log.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once -#include - -void tty_init(void); -void tty_write(const char *buf, size_t len); - -static inline void _tty_hex(const char *buf, size_t len) { - char hex[2]; - for (size_t i = 0; i < len; i++) { - hex[0] = (buf[i] & 0xF0) >> 4; - hex[0] += '0'; - if (hex[0] > '9') - hex[0] += 'a' - '9' - 1; - - hex[1] = buf[i] & 0xF; - hex[1] += '0'; - if (hex[1] > '9') - hex[1] += 'a' - '9' - 1; - - tty_write(hex, 2); - } -} - -// used for static strings -#define tty_const(str) tty_write(str, sizeof(str) - 1) - -// very hacky, shouldn't be actually used - only for debugging -// prints backwards -#define _tty_var(var) _tty_hex((void*)&var, sizeof(var)) -- cgit v1.2.3