aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/kernel.c
diff options
context:
space:
mode:
authorMarvin Borner2019-11-30 16:21:57 +0100
committerMarvin Borner2019-11-30 16:21:57 +0100
commitac947d45c288f62e927895afe7cd6a722ffdd8f8 (patch)
treecb9ed1bc1713c484b6846f068dca98e0dfc0cbc0 /src/kernel/kernel.c
parent0e94325936030990ac95b9ca90382aa265c95818 (diff)
Replaced vesa print functions with printf
Diffstat (limited to 'src/kernel/kernel.c')
-rw-r--r--src/kernel/kernel.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c
index f63bd24..ef58ade 100644
--- a/src/kernel/kernel.c
+++ b/src/kernel/kernel.c
@@ -10,12 +10,14 @@
#include <kernel/smbios/smbios.h>
#include <kernel/fs/install.h>
#include <kernel/lib/lib.h>
+#include <mlibc/stdio.h>
extern void switch_to_user();
void kernel_main()
{
vga_log("Installing basic features of Melvix...", 0);
+
// Install features
memory_init();
gdt_install();
@@ -38,8 +40,8 @@ void kernel_main()
// Get hardware information
get_smbios();
- // Booting process complete - emulate newline key
- vesa_keyboard_char('\n');
+ // Print total memory
+ info("Total memory found: %dMiB", memory_get_all() >> 10);
uint8_t boot_drive_id = (uint8_t) (*((uint8_t *) 0x9000));
if (boot_drive_id == 0xE0) {