diff options
| author | Alex AUVOLAT <alexis211@gmail.com> | 2012-05-01 12:20:45 +0200 |
|---|---|---|
| committer | Alex AUVOLAT <alexis211@gmail.com> | 2012-05-01 12:20:45 +0200 |
| commit | 5cac9acd3aedc8043d4272d93c56805c46ff6214 (patch) | |
| tree | ba9eb5ef86f7cf7afd4f7ab02de1d6bb86715632 /src/kernel/core/kmain.c | |
| parent | 66b32658d2e5aa99493dcb3abcb73cdb2cc6f0b5 (diff) | |
| download | TCE-5cac9acd3aedc8043d4272d93c56805c46ff6214.tar.gz TCE-5cac9acd3aedc8043d4272d93c56805c46ff6214.zip | |
Some cleanup ; relocated the kernel at 0xC0000000
Diffstat (limited to 'src/kernel/core/kmain.c')
| -rw-r--r-- | src/kernel/core/kmain.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/kernel/core/kmain.c b/src/kernel/core/kmain.c index 8f14843..86db4ff 100644 --- a/src/kernel/core/kmain.c +++ b/src/kernel/core/kmain.c @@ -27,12 +27,12 @@ void kmain(struct multiboot_info_t* mbd, int32_t magic) { uint32_t i; mem_placementAddr = ((size_t)&end & 0xFFFFF000) + 0x1000; - mbd->cmdline += 0xE0000000; mbd->mods_addr += 0xE0000000; + mbd->cmdline += K_HIGHHALF_ADDR; mbd->mods_addr += K_HIGHHALF_ADDR; struct module_t *mods = (struct module_t*)mbd->mods_addr; for (i = 0; i < mbd->mods_count; i++) { - mods[i].mod_start += 0xE0000000; - mods[i].mod_end += 0xE0000000; - mods[i].string += 0xE0000000; + mods[i].mod_start += K_HIGHHALF_ADDR; + mods[i].mod_end += K_HIGHHALF_ADDR; + mods[i].string += K_HIGHHALF_ADDR; if (mods[i].mod_end > mem_placementAddr) mem_placementAddr = (mods[i].mod_end & 0xFFFFF000) + 0x1000; } @@ -68,7 +68,7 @@ void kmain(struct multiboot_info_t* mbd, int32_t magic) { if (pr == 0) { monitor_write(" : Error loading\n"); } else { - monitor_write(" : OK pid:"); monitor_writeDec(pr->pid); monitor_write("\n"); + monitor_write(" : OK, pid="); monitor_writeDec(pr->pid); monitor_write("\n"); } } } |