Commit b9a2b8b0 by triazo

Add memory initilization to kernel main

parent f9adcd73
Showing with 13 additions and 0 deletions
...@@ -13,8 +13,11 @@ ...@@ -13,8 +13,11 @@
#error "This tutorial needs to be compiled with a ix86-elf compiler" #error "This tutorial needs to be compiled with a ix86-elf compiler"
#endif #endif
#include <stdint.h>
#include "serial.h" #include "serial.h"
#include "term.h" #include "term.h"
#include "mem.h"
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" /* Use C linkage for kernel_main. */ extern "C" /* Use C linkage for kernel_main. */
...@@ -31,4 +34,14 @@ void kernel_main() { ...@@ -31,4 +34,14 @@ void kernel_main() {
serial_writestring("First Serial Test!\n"); serial_writestring("First Serial Test!\n");
terminal_writestring("Hello, kernel World!\n"); terminal_writestring("Hello, kernel World!\n");
serial_writestring("Second Serial Test\n"); serial_writestring("Second Serial Test\n");
// Enable paging of memory. For now there is only one virtual
// memory space defined by page_dir
uint32_t* page_dir;
page_dir = initiate_directory();
initiate_page_table(page_dir);
loadPageDirectory(page_dir);
enablePaging();
serial_writestring("Finished Initilizing memory\n");
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment