diff options
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/Makefile | 1 | ||||
| -rw-r--r-- | libc/inc/serial.h | 9 | ||||
| -rw-r--r-- | libc/print.c | 2 | ||||
| -rw-r--r-- | libc/serial.c | 35 |
4 files changed, 1 insertions, 46 deletions
diff --git a/libc/Makefile b/libc/Makefile index eb79983..9ac6c67 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -7,7 +7,6 @@ COBJS = sanitize.o \ math.o \ conv.o \ print.o \ - serial.o \ cpu.o \ sys.o \ list.o \ diff --git a/libc/inc/serial.h b/libc/inc/serial.h deleted file mode 100644 index 4d04d6a..0000000 --- a/libc/inc/serial.h +++ /dev/null @@ -1,9 +0,0 @@ -// MIT License, Copyright (c) 2020 Marvin Borner - -#ifndef SERIAL_H -#define SERIAL_H - -void serial_install(void); -void serial_print(const char *data); - -#endif diff --git a/libc/print.c b/libc/print.c index ef51e1f..91ecf8f 100644 --- a/libc/print.c +++ b/libc/print.c @@ -6,7 +6,6 @@ #include <cpu.h> #include <def.h> #include <mem.h> -#include <serial.h> #include <str.h> static void append(char *dest, char *src, int index) @@ -160,6 +159,7 @@ int print(const char *str) // The kernel prints everything into the serial console #include <proc.h> +#include <serial.h> #define RED "\x1B[1;31m" #define GRN "\x1B[1;32m" #define YEL "\x1B[1;33m" diff --git a/libc/serial.c b/libc/serial.c deleted file mode 100644 index b11ac26..0000000 --- a/libc/serial.c +++ /dev/null @@ -1,35 +0,0 @@ -// MIT License, Copyright (c) 2020 Marvin Borner - -#include <cpu.h> -#include <def.h> -#include <serial.h> -#include <str.h> - -void serial_install(void) -{ - outb(0x3f8 + 1, 0x00); - outb(0x3f8 + 3, 0x80); - outb(0x3f8 + 0, 0x03); - outb(0x3f8 + 1, 0x00); - outb(0x3f8 + 3, 0x03); - outb(0x3f8 + 2, 0xC7); - outb(0x3f8 + 4, 0x0B); -} - -static int is_transmit_empty(void) -{ - return inb(0x3f8 + 5) & 0x20; -} - -static void serial_put(char ch) -{ - while (is_transmit_empty() == 0) - ; - outb(0x3f8, (u8)ch); -} - -void serial_print(const char *data) -{ - for (u32 i = 0; i < strlen(data); i++) - serial_put(data[i]); -} |