aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarvin Borner2020-07-26 14:34:54 +0200
committerMarvin Borner2020-07-26 14:34:54 +0200
commitd8410862be2f00bf2ce321bc28b8322f2de944a9 (patch)
treedb7895b12b9a5896b63c5dcf7af8133150e3c858 /src
parent0de8165d440c549847a1c600558305b04a36a77e (diff)
Added terminus font and config file
Diffstat (limited to 'src')
-rw-r--r--src/config.h12
-rw-r--r--src/main.c3
2 files changed, 14 insertions, 1 deletions
diff --git a/src/config.h b/src/config.h
new file mode 100644
index 0000000..08779a7
--- /dev/null
+++ b/src/config.h
@@ -0,0 +1,12 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+// General kernel config
+
+#ifndef CONFIG_H
+#define CONFIG_H
+
+int MELVIX_VERSION = 0;
+
+#define FONT_PATH "/font/ter-p32n.psf"
+//#define FONT_PATH "/font/spleen-16x32.psfu"
+
+#endif
diff --git a/src/main.c b/src/main.c
index 2c7d063..bc1cb96 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,6 @@
// MIT License, Copyright (c) 2020 Marvin Borner
+#include "config.h"
#include <boot.h>
#include <def.h>
#include <fs.h>
@@ -27,7 +28,7 @@ void main(struct mem_info *mem_info, struct vid_info *vid_info)
serial_install();
ls_root();
- gui_init("/font/spleen-16x32.psfu");
+ gui_init(FONT_PATH);
u32 c[] = { 0xff, 0xff, 0xff };
gui_write(0, 0, c, "Hello, world!");