summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoriximeow <me@iximeow.net>2015-09-28 19:03:33 -0700
committeriximeow <me@iximeow.net>2015-09-28 19:03:33 -0700
commit45603a52e25812054bc15644086fe7b8d6ff097f (patch)
treee00d582c6e90407b2d50226b562b1366db5ab1ca /src
parent993e1dd8e0def107e2532eee4d4c1adf5fb13c34 (diff)
fix build bug in mod_mem_map and actually use it
Diffstat (limited to 'src')
-rw-r--r--src/boot/mod_mem_map.c4
-rw-r--r--src/kernel/main.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/src/boot/mod_mem_map.c b/src/boot/mod_mem_map.c
index 0e89ee7..701a12e 100644
--- a/src/boot/mod_mem_map.c
+++ b/src/boot/mod_mem_map.c
@@ -2,6 +2,10 @@
#include "../output/vga_character.h"
+__asm__(".code16gcc\n");
+
void populate_memory_map(void) {
vga_graphics_write_str("pretend i populated the memory map, ok?");
+ vga_graphics_write_str(" system_memory_map = ");
+ vga_graphics_byte_hex(0x10);
}
diff --git a/src/kernel/main.c b/src/kernel/main.c
index 4e9a580..a113cbc 100644
--- a/src/kernel/main.c
+++ b/src/kernel/main.c
@@ -1,6 +1,7 @@
__asm__(".code16gcc\n");
#include "../output/vga_character.h"
+#include "../boot/mod_mem_map.h"
char foo[] = "hello how are you";
@@ -13,5 +14,7 @@ void _start() {
vga_graphics_write(':');
vga_graphics_write(' ');
vga_graphics_byte_hex(0x40);
+ populate_memory_map();
+
while(1) { }
}