diff options
| author | Marvin Borner | 2020-04-14 23:42:03 +0200 |
|---|---|---|
| committer | Marvin Borner | 2020-04-14 23:42:03 +0200 |
| commit | b11a2a876e7bd14078d26e12eab62db997a4dc76 (patch) | |
| tree | f2ba2781d3d059810e3a0ccb04f637444c448e5e /src/resources | |
| parent | 4391a5a374b7b75ca8fa69d35dcb5c5f9ad7f765 (diff) | |
Switched to grub
This really isn't what I wanted because grub is very big and bloaty but
my own bootloader was very poorly written and I really want to implement
a filesystem like ext2 which wouldn't work with my own bootloader.
Furthermore this commit fixes many small issues including the one
occurring due to the statically linked user binary (I just removed
the linking for now).
Diffstat (limited to 'src/resources')
| -rwxr-xr-x | src/resources/conv.sh | 2 | ||||
| -rw-r--r-- | src/resources/font.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/resources/conv.sh b/src/resources/conv.sh index 36a17d0..8b38016 100755 --- a/src/resources/conv.sh +++ b/src/resources/conv.sh @@ -4,7 +4,7 @@ printf "// Generated using the Spleen font and the bdf2c converter (modified using the conv.sh script)\n// Spleen font: (c) 2018-2019, Frederic Cambus, License: MIT\n // bdf2c: (c) 2009-2010 Lutz Sammer, License: AGPLv3\n\n" >font.c -printf "#include <stdint.h>\n\nuint16_t cursor[19]={0b100000000000,0b110000000000,0b111000000000,0b111100000000,0b111110000000,0b111111000000,0b111111100000,0b111111110000,0b111111111000,0b111111111100,0b111111111110,0b111111111111,0b111111111111,0b111111110000,0b111101111000,0b111001111000,0b110000111100,0b000000111100,0b000000011000};\n" >>font.c +printf "#include <stdint.h>\n\nuint32_t magic=0xf0f0f0f0;\n\nuint16_t cursor[19]={0b100000000000,0b110000000000,0b111000000000,0b111100000000,0b111110000000,0b111111000000,0b111111100000,0b111111110000,0b111111111000,0b111111111100,0b111111111110,0b111111111111,0b111111111111,0b111111110000,0b111101111000,0b111001111000,0b110000111100,0b000000111100,0b000000011000};\n" >>font.c generate() { font_url="https://raw.githubusercontent.com/fcambus/spleen/master/spleen-$1x$2.bdf" diff --git a/src/resources/font.c b/src/resources/font.c index de5dda1..4269b35 100644 --- a/src/resources/font.c +++ b/src/resources/font.c @@ -4,6 +4,8 @@ #include <stdint.h> +uint32_t magic = 0xf0f0f0f0; + uint16_t cursor[19] = { 0b100000000000, 0b110000000000, 0b111000000000, 0b111100000000, 0b111110000000, 0b111111000000, 0b111111100000, 0b111111110000, 0b111111111000, 0b111111111100, 0b111111111110, 0b111111111111, |