diff options
| author | Michal Idziorek <m.i@gmx.at> | 2014-09-04 23:38:33 +0200 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2014-09-04 23:38:33 +0200 |
| commit | 467e19b262d435f1820539bc0c85ed4fa31b9687 (patch) | |
| tree | c3ee7690b089713614309857ecfc046d6a13d160 /kernel | |
| parent | 487ecc1615ccc0368f1520c1146b2b43cdab6577 (diff) | |
Finally we have a 2 stage bootloader !
This one can load the ramdis up to 0xfffff :)
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/kernel.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c index 33624ad..0feca14 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -34,6 +34,7 @@ void kernel_main(uint32_t initial_stack, int mp) { + /// TODO /////// SYMMETRIC MULTIPROCESSING, APS get caought here, move it away /// // catch the APs (Application Processors) @@ -80,7 +81,7 @@ void kernel_main(uint32_t initial_stack, int mp) // this function returns the physical base address of // our video memory // - uint32_t vesa_physbase=vesa_init(0x8300,0x8400,0x90000+0x200); + uint32_t vesa_physbase=vesa_init(0x8300,0x8400,0x80000+0x200); // self-log message of logger :P log_log(); @@ -115,7 +116,7 @@ void kernel_main(uint32_t initial_stack, int mp) // we know that here, the bootloader placed the mamory map and // the number of entries. // - mem_init(0x7c00+0x400,*((uint16_t *)(0x7c00+0x600))); + mem_init(0x7c00+1,*((uint16_t *)(0x7c00))); // @@ -132,7 +133,7 @@ void kernel_main(uint32_t initial_stack, int mp) // // Start the other Processors (also before paging !) // - smp_start_aps(&procdata,0x90000); // starts at 0x90000 + smp_start_aps(&procdata,0x80000); // starts at 0x90000 // but it will be copied over mbr // |