aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/kernel.c
diff options
context:
space:
mode:
authorMarvin Borner2020-04-17 19:55:42 +0200
committerMarvin Borner2020-04-17 19:55:42 +0200
commit27c38d3f6e473d2bf7075fb364db148f22aca203 (patch)
treefeec581b3198056143efab07d154a3dafeb79d80 /src/kernel/kernel.c
parent0aea2cf7d4c53f49e48c272ac7427ab337b476db (diff)
Added multiboot smbios table
idk why, but grub doesn't seem to find a smbios table in qemu. I tried a local dump of my pc's smbios but this doesn't work either.. *thinking*
Diffstat (limited to 'src/kernel/kernel.c')
-rw-r--r--src/kernel/kernel.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index 42395d4..144ae8c 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -45,13 +45,6 @@ void kernel_main(uint32_t magic, uint32_t multiboot_address)
memory_print();
- vfs_init();
- ata_init();
- ext2_init("/dev/hda", "/");
-
- load_binaries();
- set_optimal_resolution();
-
// Install drivers
cli();
timer_install();
@@ -61,10 +54,14 @@ void kernel_main(uint32_t magic, uint32_t multiboot_address)
network_install();
sti();
- // tasking_install();
+ vfs_init();
+ ata_init();
+ ext2_init("/dev/hda", "/");
- // Get hardware information
- // get_smbios();
+ load_binaries();
+ set_optimal_resolution();
+
+ // tasking_install();
#ifdef INSTALL_MELVIX
panic("Installation isn't supported right now!");