moved video/ -> drivers/terminal/

kernel/video/terminal.c → kernel/drivers/terminal/terminal.c

@@ -1,11 +1,14 @@
 #include <stddef.h>
 #include <stdbool.h>
+
 #include "terminal.h"
 #include "video.h"
-#include "../lib/string.h"
-#include "../lib/assert.h"
-#include "../lib/logging.h"
-#include "../memory/kalloc.h"
+
+#include "../../lib/string.h"
+#include "../../lib/assert.h"
+#include "../../lib/logging.h"
+#include "../../memory/kalloc.h"
+
 
 #define TAB_SPACE 6
 

kernel/video/terminal.h → kernel/drivers/terminal/terminal.h

@@ -2,7 +2,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include "../lib/assert.h"
+#include "../../lib/assert.h"
 
 
 #define TERMINAL_CHARMAP_W 6

kernel/video/video.c → kernel/drivers/terminal/video.c

@@ -3,11 +3,11 @@
 // for initialization
 #include <stivale2.h>
 
-#include "../lib/string.h"
-#include "../lib/logging.h"
+#include "../../lib/string.h"
+#include "../../lib/logging.h"
 //#include "../memory/kalloc.h"
-#include "../lib/common.h"
-#include "../lib/assert.h"
+#include "../../lib/common.h"
+#include "../../lib/assert.h"
 #include "video.h"
 #include "terminal.h"
 
@@ -80,8 +80,8 @@ void imageLower_blitBinaryMask(
     assert((size_t)src_skip  % 8 == 0);
     
 
-    uint32_t* src_ptr32 = (uint32_t *)src_ptr;
-    uint32_t* dst_ptr32 = (uint32_t *)dst_ptr;
+    uint32_t* restrict src_ptr32 = (uint32_t *)src_ptr;
+    uint32_t* restrict dst_ptr32 = (uint32_t *)dst_ptr;
 
 
     

kernel/entry.c

@@ -3,8 +3,8 @@
 #include <stivale2.h>
 
 #include "memory/gdt.h"
-#include "video/video.h"
-#include "video/terminal.h"
+#include "drivers/terminal/video.h"
+#include "drivers/terminal/terminal.h"
 #include "acpi/acpi.h"
 #include "int/apic.h"
 #include "int/idt.h"

kernel/lib/logging.c

@@ -1,10 +1,11 @@
 #include <stdarg.h>
 
+#include "../drivers/terminal/terminal.h"
 #include "../lib/sprintf.h"
+#include "../lib/string.h"
+
 #include "logging.h"
-#include "../video/terminal.h"
 
-#include "../lib/string.h"
 
 #define TEXT_COLOR 0xfff0a0
 

kernel/lib/panic.c

@@ -1,6 +1,6 @@
 #include "panic.h"
 #include "../lib/sprintf.h"
-#include "../video/terminal.h"
+#include "../drivers/terminal/terminal.h"
 
 
 int zero = 0;

kernel/lib/sprintf.c

@@ -1,7 +1,7 @@
 #include "sprintf.h"
 #include "math.h"
 #include "string.h"
-#include "../video/terminal.h"
+#include "../drivers/terminal/terminal.h"
 
 #define SIGN(X) X > 0 ? 1 : -1
 #define ARG(TYPE) (TYPE)va_arg(ap, TYPE)