From d37abb7b653b8ae811e498554c86a68430029e6c Mon Sep 17 00:00:00 2001
From: Tom-on64 <kubecekt@gmail.com>
Date: Tue, 13 Aug 2024 15:20:13 +0200
Subject: [PATCH] Moved bigError()

---
 include/error/bigerr.h | 66 ++++++++++++++++++++++++++++++++++++++++++
 src/stage3.c           | 59 +------------------------------------
 2 files changed, 67 insertions(+), 58 deletions(-)
 create mode 100644 include/error/bigerr.h

diff --git a/include/error/bigerr.h b/include/error/bigerr.h
new file mode 100644
index 0000000..31681d8
--- /dev/null
+++ b/include/error/bigerr.h
@@ -0,0 +1,66 @@
+#ifndef BIGERR_H
+#define BIGERR_H
+
+/*
+ * Something went VERY wrong. 
+ * Eg. kernel.bin is missing, no filesystem, Virtual Memory failed, etc.
+ */
+
+#include <stdint.h>
+#include <screen/gfxmode.h>
+
+void rect(uint32_t c, uint16_t x, uint16_t y, uint16_t w, uint16_t h) {
+    uint8_t* vidmem = (uint8_t*)gfxMode->physicalBasePtr;
+    uint8_t bytesPerPx = gfxMode->bpp / 8;
+    uint32_t convColor = convertColor(c);
+
+    for (uint32_t dx = 0; dx < w; dx++) {
+        for (uint32_t dy = 0; dy < h; dy++) {
+            uint32_t offset = (((y + dy) * gfxMode->xRes) + (x + dx)) * bytesPerPx;
+
+            for (uint8_t i = 0; i < gfxMode->bpp; i++) {
+                vidmem[offset + i] = (uint8_t)(convColor >> (i*8));
+            }
+        }
+    }
+}
+
+void bigError(uint32_t err) {
+    // Red BG
+    rect(0x00ff0000, 0, 0, gfxMode->xRes, gfxMode->yRes);
+    // E
+    rect(0x00ffffff, 20, 10, 10, 50);
+    rect(0x00ffffff, 30, 10, 30, 10);
+    rect(0x00ffffff, 30, 30, 30, 10);
+    rect(0x00ffffff, 30, 50, 30, 10);
+    // R
+    rect(0x00ffffff, 70, 10, 10, 50);
+    rect(0x00ffffff, 70, 10, 30, 10);
+    rect(0x00ffffff, 70, 30, 30, 10);
+    rect(0x00ffffff, 90, 10, 10, 30);
+    rect(0x00ffffff, 80, 40, 10, 10);
+    rect(0x00ffffff, 90, 50, 10, 10);
+    // R
+    rect(0x00ffffff, 110, 10, 10, 50);
+    rect(0x00ffffff, 110, 10, 30, 10);
+    rect(0x00ffffff, 110, 30, 30, 10);
+    rect(0x00ffffff, 130, 10, 10, 30);
+    rect(0x00ffffff, 120, 40, 10, 10);
+    rect(0x00ffffff, 130, 50, 10, 10);
+    // O
+    rect(0x00ffffff, 150, 10, 10, 50);
+    rect(0x00ffffff, 170, 10, 10, 50);
+    rect(0x00ffffff, 150, 10, 30, 10);
+    rect(0x00ffffff, 150, 50, 30, 10);
+    // R
+    rect(0x00ffffff, 190, 10, 10, 50);
+    rect(0x00ffffff, 190, 10, 30, 10);
+    rect(0x00ffffff, 190, 30, 30, 10);
+    rect(0x00ffffff, 210, 10, 10, 30);
+    rect(0x00ffffff, 200, 40, 10, 10);
+    rect(0x00ffffff, 210, 50, 10, 10);
+
+    __asm__ volatile ("cli; hlt" :: "a"(err));
+}
+
+#endif
diff --git a/src/stage3.c b/src/stage3.c
index 1d0dd9a..d575d29 100644
--- a/src/stage3.c
+++ b/src/stage3.c
@@ -5,6 +5,7 @@
 #include <fs/impl.h>
 #include <fs/fs.h>
 #include <screen/gfxmode.h>
+#include <error/bigerr.h>
 
 void bigError();
 
@@ -79,61 +80,3 @@ void main() {
     bigError(0xffffffff);
 }
 
-void rect(uint32_t c, uint16_t x, uint16_t y, uint16_t w, uint16_t h) {
-    uint8_t* vidmem = (uint8_t*)gfxMode->physicalBasePtr;
-    uint8_t bytesPerPx = gfxMode->bpp / 8;
-    uint32_t convColor = convertColor(c);
-
-    for (uint32_t dx = 0; dx < w; dx++) {
-        for (uint32_t dy = 0; dy < h; dy++) {
-            uint32_t offset = (((y + dy) * gfxMode->xRes) + (x + dx)) * bytesPerPx;
-
-            for (uint8_t i = 0; i < gfxMode->bpp; i++) {
-                vidmem[offset + i] = (uint8_t)(convColor >> (i*8));
-            }
-        }
-    }
-}
-
-/*
- * Something went VERY wrong. 
- * Eg. kernel.bin is missing, no filesystem, Virtual Memory failed, etc.
- */
-void bigError(uint32_t err) {
-    // Red BG
-    rect(0x00ff0000, 0, 0, gfxMode->xRes, gfxMode->yRes);
-    // E
-    rect(0x00ffffff, 20, 10, 10, 50);
-    rect(0x00ffffff, 30, 10, 30, 10);
-    rect(0x00ffffff, 30, 30, 30, 10);
-    rect(0x00ffffff, 30, 50, 30, 10);
-    // R
-    rect(0x00ffffff, 70, 10, 10, 50);
-    rect(0x00ffffff, 70, 10, 30, 10);
-    rect(0x00ffffff, 70, 30, 30, 10);
-    rect(0x00ffffff, 90, 10, 10, 30);
-    rect(0x00ffffff, 80, 40, 10, 10);
-    rect(0x00ffffff, 90, 50, 10, 10);
-    // R
-    rect(0x00ffffff, 110, 10, 10, 50);
-    rect(0x00ffffff, 110, 10, 30, 10);
-    rect(0x00ffffff, 110, 30, 30, 10);
-    rect(0x00ffffff, 130, 10, 10, 30);
-    rect(0x00ffffff, 120, 40, 10, 10);
-    rect(0x00ffffff, 130, 50, 10, 10);
-    // O
-    rect(0x00ffffff, 150, 10, 10, 50);
-    rect(0x00ffffff, 170, 10, 10, 50);
-    rect(0x00ffffff, 150, 10, 30, 10);
-    rect(0x00ffffff, 150, 50, 30, 10);
-    // R
-    rect(0x00ffffff, 190, 10, 10, 50);
-    rect(0x00ffffff, 190, 10, 30, 10);
-    rect(0x00ffffff, 190, 30, 30, 10);
-    rect(0x00ffffff, 210, 10, 10, 30);
-    rect(0x00ffffff, 200, 40, 10, 10);
-    rect(0x00ffffff, 210, 50, 10, 10);
-
-    __asm__ volatile ("cli; hlt" :: "a"(err));
-}
-