itos

kernel/drivers/terminal/terminal.cpp

@@ -1,6 +1,7 @@
 #include "terminal.h"
 
 #include <kernel/kernio.h>
+#include <lib/std/string.h>
 
 static const int TERMINAL_WIDTH = 80;
 static const int TERMINAL_HEIGHT = 24;
@@ -41,32 +42,33 @@ void puts(int x, int y, char c, char foreground, char background) {
     frameBuffer[(y * TERMINAL_WIDTH) + x].background = background;
 }
 
-void write(char* input) {
-    for (uint32_t i = 0; i < strlen(input); i++) {
-        if (cursor.x + 1 > TERMINAL_WIDTH) {
-            nline();
-        }
-        if (input[i] == '\n') {
-            nline();
-        } else {
-            puts(cursor.x, cursor.y, input[i], fgColour, bgColour);
-            cursor.x++;
-        }
-    }
-    updateCursor(cursor);
-}
-
-void writeln(char* input) {
-    write(input);
-    nline();
-}
-
 void nline() {
     cursor.y++;
     cursor.x = 0;
     updateCursor(cursor);
 }
 
+void write(char* input) {
+	for (uint32_t i = 0; i < strlen(input); i++) {
+		if (cursor.x + 1 > TERMINAL_WIDTH) {
+			nline();
+		}
+		if (input[i] == '\n') {
+			nline();
+		}
+		else {
+			puts(cursor.x, cursor.y, input[i], fgColour, bgColour);
+			cursor.x++;
+		}
+	}
+	updateCursor(cursor);
+}
+
+void writeln(char* input) {
+	write(input);
+	nline();
+}
+
 void setClearColour(char col) {
     clearColour = col;
 }

kernel/drivers/terminal/terminal.h

@@ -1,4 +1,5 @@
-#include <lib/std/string.h>
+#pragma once
+
 #include <lib/stdint.h>
 
 enum {
@@ -36,11 +37,11 @@ void cls();
 void puts(char input);
 void puts(int x, int y, char c, char foreground, char background);
 
+void nline();
+
 void write(char* input);
 void writeln(char* input);
 
-void nline();
-
 void setClearColour(char col);
 void setFGColour(char col);
 void setBGColour(char col);

kernel/kernio.h

@@ -1,3 +1,5 @@
+#pragma once
+
 #include <lib/stdint.h>
 
 inline void outb(uint16_t port, uint8_t b) {

kernel/multiboot.h

@@ -0,0 +1,35 @@
+#pragma once
+
+#include <lib/stdint.h>
+
+// Totally stolen from here https://forum.osdev.org/viewtopic.php?f=1&t=8881
+struct multibootInfo_t {
+    uint32_t flags;
+    uint32_t mem_lower;
+    uint32_t mem_upper;
+    uint32_t boot_devices;
+    uint32_t cmdline;
+    uint32_t mods_count;
+    uint32_t mods_addr;
+    uint32_t syms_num;
+    uint32_t syms_size;
+    uint32_t syms_addr;
+    uint32_t syms_shndx;
+    uint32_t mmap_length;
+    uint32_t mmap_addr;
+    uint32_t drives_length;
+    uint32_t drives_addr;
+    uint32_t config_table;
+    char boot_loader_name[4];
+    uint32_t apm_table;
+    uint32_t vbe_control_info;
+    uint32_t vbe_mode_info;
+    uint16_t vbe_mode;
+    uint16_t vbe_interface_seg;
+    uint16_t vbe_interface_off;
+    uint16_t vbe_interface_len;
+    uint64_t framebuffer_addr;
+    uint32_t framebuffer_pitch;
+    uint32_t framebuffer_width;
+    uint32_t framebuffer_height;
+};