From 8f16150cf562f98af7ea7d6573b89b992acd4799 Mon Sep 17 00:00:00 2001
From: Mathieu Serandour <mathieu.serandour@telecom-paris.fr>
Date: Tue, 7 Dec 2021 11:32:47 +0100
Subject: [PATCH] moved video/ -> drivers/terminal/

---
 kernel/{video => drivers/terminal}/terminal.c | 11 +++++++----
 kernel/{video => drivers/terminal}/terminal.h |  2 +-
 kernel/{video => drivers/terminal}/video.c    | 12 ++++++------
 kernel/{video => drivers/terminal}/video.h    |  0
 kernel/entry.c                                |  4 ++--
 kernel/lib/logging.c                          |  5 +++--
 kernel/lib/panic.c                            |  2 +-
 kernel/lib/sprintf.c                          |  2 +-
 8 files changed, 21 insertions(+), 17 deletions(-)
 rename kernel/{video => drivers/terminal}/terminal.c (94%)
 rename kernel/{video => drivers/terminal}/terminal.h (93%)
 rename kernel/{video => drivers/terminal}/video.c (94%)
 rename kernel/{video => drivers/terminal}/video.h (100%)

diff --git a/kernel/video/terminal.c b/kernel/drivers/terminal/terminal.c
similarity index 94%
rename from kernel/video/terminal.c
rename to kernel/drivers/terminal/terminal.c
index 7e38b4c..77108a4 100644
--- a/kernel/video/terminal.c
+++ b/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
 
diff --git a/kernel/video/terminal.h b/kernel/drivers/terminal/terminal.h
similarity index 93%
rename from kernel/video/terminal.h
rename to kernel/drivers/terminal/terminal.h
index 5ac573f..2e838ea 100644
--- a/kernel/video/terminal.h
+++ b/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
diff --git a/kernel/video/video.c b/kernel/drivers/terminal/video.c
similarity index 94%
rename from kernel/video/video.c
rename to kernel/drivers/terminal/video.c
index e4ddab4..081fb85 100644
--- a/kernel/video/video.c
+++ b/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;
 
 
     
diff --git a/kernel/video/video.h b/kernel/drivers/terminal/video.h
similarity index 100%
rename from kernel/video/video.h
rename to kernel/drivers/terminal/video.h
diff --git a/kernel/entry.c b/kernel/entry.c
index 409769b..420b9ad 100644
--- a/kernel/entry.c
+++ b/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"
diff --git a/kernel/lib/logging.c b/kernel/lib/logging.c
index a0f808e..e919c78 100644
--- a/kernel/lib/logging.c
+++ b/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
 
diff --git a/kernel/lib/panic.c b/kernel/lib/panic.c
index b6c0f2e..1a334a1 100644
--- a/kernel/lib/panic.c
+++ b/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;
diff --git a/kernel/lib/sprintf.c b/kernel/lib/sprintf.c
index e14b9c2..db096b1 100644
--- a/kernel/lib/sprintf.c
+++ b/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)