diff options
author | Marvin Borner | 2020-07-25 17:41:54 +0200 |
---|---|---|
committer | Marvin Borner | 2020-07-25 17:41:54 +0200 |
commit | 6e8fd8c61a77e4eb08d859f8e0fc42226cc4c7f3 (patch) | |
tree | b0b23183affa278eff2c7c142e89e47dc40d9dd9 /src/main.c | |
parent | be9ade5ac65209277dc18f8eb9b03a55e2b9e6ad (diff) |
Added very basic PSF parser
Version 1 works; Version 2 not so much
Diffstat (limited to 'src/main.c')
-rw-r--r-- | src/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -6,6 +6,7 @@ #include <interrupts.h> #include <keyboard.h> #include <print.h> +#include <psf.h> #include <serial.h> #include <vesa.h> @@ -19,16 +20,15 @@ void main(struct mem_info *mem_info, struct vid_info *vid_info) keyboard_install(); mem_info++; // TODO: Use the mmap (or remove)! - vbe = vid_info->info; - u8 terminal_background[3] = { 0x1d, 0x1f, 0x24 }; + vesa_init(vid_info->info); + u32 terminal_background[3] = { 0x1d, 0x1f, 0x24 }; vesa_fill(terminal_background); serial_install(); - printf("hello\n"); ls_root(); - printf("%s", read_file("test.txt", 2)); + psf_parse(read_file("/font/spleen-8x16.psfu")); while (1) { }; |