headers/kprintf.h

@@ -1,19 +0,0 @@
-#pragma once
-
-#include <stdarg.h>
-
-enum print_level {
-    KERN_EMERG,
-    KERN_ALERT,
-    KERN_CRIT,
-    KERN_ERR,
-    KERN_WARNING,
-    KERN_NOTICE,
-    KERN_INFO,
-    KERN_DEBUG,
-    KERN_DEFAULT,
-    KERN_CONT
-}
-
-int kprintf(enum print_level level, const char *restrict format, ...);
-int vprintf(enum print_level level, const char *restrict format, va_list ap);

headers/terminal.h

@@ -1,27 +0,0 @@
-#pragma once
-
-enum vga_color {
-	VGA_COLOR_BLACK = 0,
-	VGA_COLOR_BLUE = 1,
-	VGA_COLOR_GREEN = 2,
-	VGA_COLOR_CYAN = 3,
-	VGA_COLOR_RED = 4,
-	VGA_COLOR_MAGENTA = 5,
-	VGA_COLOR_BROWN = 6,
-	VGA_COLOR_LIGHT_GREY = 7,
-	VGA_COLOR_DARK_GREY = 8,
-	VGA_COLOR_LIGHT_BLUE = 9,
-	VGA_COLOR_LIGHT_GREEN = 10,
-	VGA_COLOR_LIGHT_CYAN = 11,
-	VGA_COLOR_LIGHT_RED = 12,
-	VGA_COLOR_LIGHT_MAGENTA = 13,
-	VGA_COLOR_LIGHT_BROWN = 14,
-	VGA_COLOR_WHITE = 15,
-};
-
-void terminal_initialize(void);
-void terminal_setcolor(uint8_t color);
-void terminal_putentryat(char c, uint8_t color, size_t x, size_t y);
-void terminal_putchar(char c);
-void terminal_write(const char* data, size_t size);
-void terminal_writestring(const char* data);

src/kprint/kprintf.c

@@ -1,18 +0,0 @@
-#include "../../headers/kprint.h"
-#include "../../headers/string.h"
-#include "../../headers/terminal.h"
-#include "../../headers/ctype.h"
-
-#include <stdarg.h>
-
-int kprintf(int level, const char *restrict format, ...)
-{
-    va_list	va;
-	int		i;
-
-	va_start(va, format);
-	i = ft_vdprintf(level, format, va);
-	va_end(va);
-
-	return (i);
-}

src/kprint/kvprintf.c

@@ -1,41 +0,0 @@
-#include "../../headers/kprint.h"
-#include "../../headers/string.h"
-#include "../../headers/terminal.h"
-#include "../../headers/ctype.h"
-
-#include <stdarg.h>
-
-static int print_flag(char flag, va_list ap)
-{
-	switch (flag) {
-		case 'i':
-			return terminal_writelong(va_arg(ap, int));
-		case 'd':
-			return terminal_writelong(va_arg(ap, int));
-		case 'c':
-			return terminal_putchar(va_arg(ap, int));
-		case 's':
-			return terminal_writestring(va_arg(ap, char *));
-	}
-}
-
-int kvprintf(int level, const char *restrict format, va_list ap)
-{
-	const char *start = format;
-	const char *flag;
-	long padding;
-
-	while (*start != '\0') {
-		flag = strchr(start, '%');
-		if (flag != NULL) {
-			padding = atoll(start + 1);
-			for (; isdigit(*padding); padding++);
-			print_flag(*padding, ap);
-			start = padding + 1;
-		}
-		else {
-			terminal_writestring(start);
-			start += strlen(start);
-		}
-	}
-}

src/terminal/terminal.c

@@ -1,88 +0,0 @@
-#include "../../headers/terminal.h"
-
-static inline uint8_t vga_entry_color(enum vga_color fg, enum vga_color bg) 
-{
-	return fg | bg << 4;
-}
-
-static inline uint16_t vga_entry(unsigned char uc, uint8_t color) 
-{
-	return (uint16_t) uc | (uint16_t) color << 8;
-}
-
-size_t strlen(const char* str) 
-{
-	size_t len = 0;
-	while (str[len])
-		len++;
-	return len;
-}
-
-static const size_t VGA_WIDTH = 80;
-static const size_t VGA_HEIGHT = 25;
-
-size_t terminal_row;
-size_t terminal_column;
-uint8_t terminal_color;
-uint16_t* terminal_buffer;
-
-void terminal_initialize(void) 
-{
-	terminal_row = 0;
-	terminal_column = 0;
-	terminal_color = vga_entry_color(VGA_COLOR_LIGHT_GREY, VGA_COLOR_BLACK);
-	terminal_buffer = (uint16_t*) 0xB8000;
-	for (size_t y = 0; y < VGA_HEIGHT; y++) {
-		for (size_t x = 0; x < VGA_WIDTH; x++) {
-			const size_t index = y * VGA_WIDTH + x;
-			terminal_buffer[index] = vga_entry(' ', terminal_color);
-		}
-	}
-}
-
-void terminal_setcolor(uint8_t color) 
-{
-	terminal_color = color;
-}
-
-void terminal_putentryat(char c, uint8_t color, size_t x, size_t y) 
-{
-	const size_t index = y * VGA_WIDTH + x;
-	terminal_buffer[index] = vga_entry(c, color);
-}
-
-void terminal_putchar(char c) 
-{
-	terminal_putentryat(c, terminal_color, terminal_column, terminal_row);
-	if (++terminal_column == VGA_WIDTH) {
-		terminal_column = 0;
-		if (++terminal_row == VGA_HEIGHT)
-			terminal_row = 0;
-	}
-}
-
-void terminal_write(const char* data, size_t size) 
-{
-	for (size_t i = 0; i < size; i++)
-		terminal_putchar(data[i]);
-}
-
-void terminal_writestring(const char* data) 
-{
-	terminal_write(data, strlen(data));
-}
-
-void terminal_writelong(long number)
-{
-    unsigned long number2 = number;
-
-    if (number < 0) {
-        terminal_putchar('-');
-        number2 = -number;
-    }
-    else {
-        if (number2 > 9)
-            terminal_writelong(number2 / 10);          
-        terminal_putchar(number2 % 10);
-    }
-}