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/kernel/fs | |
| 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/kernel/fs')
| -rw-r--r-- | src/kernel/fs/load.c | 8 | ||||
| -rw-r--r-- | src/kernel/fs/load.h | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/kernel/fs/load.c b/src/kernel/fs/load.c index b717e4f..49d31e1 100644 --- a/src/kernel/fs/load.c +++ b/src/kernel/fs/load.c @@ -13,8 +13,7 @@ void load_binaries() userspace = (uint32_t)kmalloc(10000); font = (struct font *)kmalloc(100000); // High quality shit - uint8_t boot_drive_id = (uint8_t)(*((uint8_t *)0x9000)); - if (boot_drive_id != 0xE0) { + if (multiboot_header->boot_device != 0xE0FFFFFF) { struct ata_interface *primary_master = new_ata(1, 0x1F0); marfs_init(primary_master); marfs_read_whole_file(4, (uint8_t *)userspace); @@ -33,6 +32,11 @@ void load_binaries() panic("Userspace binary not found!"); ATAPI_granular_read(1 + (user_e->length / 2048), user_e->lba, (uint8_t *)userspace); kfree(user_e); + + if (font->magic != 0xf0f0f0f0) { + serial_printf("0x%x: WRONG FONT MAGIC!", font->magic); + halt_loop(); + } } vga_log("Successfully loaded binaries"); }
\ No newline at end of file diff --git a/src/kernel/fs/load.h b/src/kernel/fs/load.h index 3730b0b..d4833ce 100644 --- a/src/kernel/fs/load.h +++ b/src/kernel/fs/load.h @@ -12,6 +12,7 @@ struct font { uint16_t font_24[758][24]; uint8_t font_16[758][16]; uint16_t cursor[19]; + uint32_t magic; }; void load_binaries(); |