diff options
| author | Michal Idziorek <m.i@gmx.at> | 2014-10-22 21:21:32 +0200 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2014-10-22 21:21:32 +0200 |
| commit | 55365e593c27b57c50a7369597bd14f110ba8cb6 (patch) | |
| tree | c88de36646fd9ebee7ed270fbd35285417715fe7 /kernel | |
| parent | 95450710a8b8290a110686d78c2357d3920bcda5 (diff) | |
reading userprogramm from ext2 ramimage!
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/kernel.c | 7 | ||||
| -rw-r--r-- | kernel/mem.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c index 1500919..42a2da2 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -159,7 +159,6 @@ void kernel_main(uint32_t initial_stack, int mp) //smp_start_aps(&procdata,0x80000); // starts at 0x80000 // but it will be copied over mbr - // // Activate Virtual Memory (paging) // @@ -203,8 +202,12 @@ void kernel_main(uint32_t initial_stack, int mp) // //vesa_init_doublebuff(); + ext2_check(0x80800); + ext2_read_root_dir(0x80800); + ext2_inode_content(0x80800,15,0x100000,0x100000); + // autorun "user-space" prog - asm("push $0x80800"); + asm("push $0x100000"); asm("ret"); // Just hang around here, if its reached. diff --git a/kernel/mem.c b/kernel/mem.c index af58877..00b6a90 100644 --- a/kernel/mem.c +++ b/kernel/mem.c @@ -225,7 +225,7 @@ void mem_init(uint16_t *memmap,uint16_t entries) } // here is somewhere our kernel stuff ;) // todo!! better. - pmmngr_deinit_region(0x0,0xfffff); + pmmngr_deinit_region(0x0,0x300000); // and here is the memory map that we JUST created! pmmngr_deinit_region(_mmngr_memory_map,mem_array_size*4); |