From bb2a6b4d93512e8afc1b1999eb58f1f506cc27ae Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sun, 26 Jan 2020 18:38:36 +0100
Subject: Magic commit

Some things work, others don't.
---
 src/kernel/graphics/font.c | 26 --------------------------
 src/kernel/graphics/font.h | 19 -------------------
 src/kernel/graphics/vesa.c |  2 +-
 src/kernel/graphics/vesa.h |  2 --
 4 files changed, 1 insertion(+), 48 deletions(-)
 delete mode 100644 src/kernel/graphics/font.c
 delete mode 100644 src/kernel/graphics/font.h

(limited to 'src/kernel/graphics')

diff --git a/src/kernel/graphics/font.c b/src/kernel/graphics/font.c
deleted file mode 100644
index 10372b3..0000000
--- a/src/kernel/graphics/font.c
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <kernel/fs/marfs/marfs.h>
-#include <kernel/graphics/font.h>
-#include <kernel/fs/ata_pio.h>
-#include <kernel/fs/atapi_pio.h>
-#include <kernel/system.h>
-#include <kernel/fs/iso9660/iso9660.h>
-#include <kernel/memory/kheap.h>
-
-void font_install()
-{
-    font = (struct font *) kmalloc(100000);; // High quality shit
-
-    uint8_t boot_drive_id = (uint8_t) (*((uint8_t *) 0x9000));
-    if (boot_drive_id != 0xE0) {
-        struct ata_interface *primary_master = new_ata(1, 0x1F0);
-        marfs_init(primary_master);
-        marfs_read_whole_file(5, (uint8_t *) font);
-    } else {
-        char *font_p[] = {"FONT.BIN"};
-        struct iso9660_entity *font_e = ISO9660_get(font_p, 1);
-        if (!font_e) panic("Font not found!");
-        ATAPI_granular_read(1 + (font_e->length / 2048), font_e->lba, (uint8_t *) font);
-        kfree(font_e);
-    }
-    vga_log("Successfully loaded font");
-}
\ No newline at end of file
diff --git a/src/kernel/graphics/font.h b/src/kernel/graphics/font.h
deleted file mode 100644
index 7778979..0000000
--- a/src/kernel/graphics/font.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Generated using the Spleen font and the bdf2c converter (modified using the conv.sh script)
-// Spleen font: (c) 2018-2019, Frederic Cambus, License: MIT
-// bdf2c: (c) 2009-2010 Lutz Sammer, License: AGPLv3
-
-#ifndef MELVIX_FONT_H
-#define MELVIX_FONT_H
-
-#include <stdint.h>
-
-struct font *font;
-
-struct font {
-    uint16_t font_32[758][32];
-    uint16_t font_24[758][24];
-    uint8_t font_16[758][16];
-    uint16_t cursor[19];
-};
-
-#endif
diff --git a/src/kernel/graphics/vesa.c b/src/kernel/graphics/vesa.c
index e2b0036..576fc18 100644
--- a/src/kernel/graphics/vesa.c
+++ b/src/kernel/graphics/vesa.c
@@ -1,5 +1,5 @@
 #include <kernel/graphics/vesa.h>
-#include <kernel/graphics/font.h>
+#include <kernel/fs/load.h>
 #include <kernel/lib/lib.h>
 #include <kernel/system.h>
 #include <kernel/lib/stdlib.h>
diff --git a/src/kernel/graphics/vesa.h b/src/kernel/graphics/vesa.h
index 2288760..22590de 100644
--- a/src/kernel/graphics/vesa.h
+++ b/src/kernel/graphics/vesa.h
@@ -185,8 +185,6 @@ void vesa_draw_cursor(int x, int y);
  */
 void vesa_set_color(uint32_t color);
 
-void font_install();
-
 /**
  * An enum with vesa colors
  * From https://github.com/joshdick/onedark.vim/ License: MIT
-- 
cgit v1.2.3