aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/kernel.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/kernel/kernel.c')
-rw-r--r--src/kernel/kernel.c72
1 files changed, 36 insertions, 36 deletions
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index 9ce1e14..9a87579 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -17,54 +17,54 @@
void kernel_main(uint32_t initial_stack)
{
- initial_esp = initial_stack;
- vga_log("Installing basic features of Melvix...");
+ initial_esp = initial_stack;
+ vga_log("Installing basic features of Melvix...");
- // Install features
- memory_init();
- gdt_install();
- init_serial();
- acpi_install();
- idt_install();
- isrs_install();
- irq_install();
- paging_install();
+ // Install features
+ memory_init();
+ gdt_install();
+ init_serial();
+ acpi_install();
+ idt_install();
+ isrs_install();
+ irq_install();
+ paging_install();
- load_binaries();
- set_optimal_resolution();
+ load_binaries();
+ set_optimal_resolution();
- // Install drivers
- cli();
- timer_install();
- mouse_install();
- keyboard_install();
- pci_remap();
- network_install();
- sti();
+ // Install drivers
+ cli();
+ timer_install();
+ mouse_install();
+ keyboard_install();
+ pci_remap();
+ network_install();
+ sti();
- // tasking_install();
+ // tasking_install();
- // Get hardware information
- // get_smbios();
+ // Get hardware information
+ // get_smbios();
- // Print total memory
- info("Total memory found: %dMiB", (memory_get_all() >> 10) + 1);
+ // Print total memory
+ info("Total memory found: %dMiB", (memory_get_all() >> 10) + 1);
#ifdef INSTALL_MELVIX
#include <kernel/fs/install.h>
- serial_printf("Install flag given!");
- if ((*((uint8_t *) 0x9000)) == 0xE0)
- install_melvix();
+ serial_printf("Install flag given!");
+ if ((*((uint8_t *)0x9000)) == 0xE0)
+ install_melvix();
#endif
- loader_init();
- elf_init();
- exec_start((uint8_t *) userspace);
+ loader_init();
+ elf_init();
+ exec_start((uint8_t *)userspace);
-// syscalls_install();
-// exec(userspace);
+ // syscalls_install();
+ // exec(userspace);
- panic("This should NOT happen!");
+ panic("This should NOT happen!");
- // asm ("div %0" :: "r"(0)); // Exception testing x/0
+ // asm ("div %0" :: "r"(0)); // Exception testing x/0
}