diff options
| author | Miguel <m.i@gmx.at> | 2018-10-04 02:17:13 +0200 |
|---|---|---|
| committer | Miguel <m.i@gmx.at> | 2018-10-04 02:17:13 +0200 |
| commit | 81a8252db679351f5ba388b420519724c9c2c2be (patch) | |
| tree | d21bb88fb36f9492c0daf14d67c46f0b22b66def /kernel/vmem.c | |
| parent | ce16fe524c14ccaae67fb634105da5aef08ead48 (diff) | |
reverting userspace idea
Diffstat (limited to 'kernel/vmem.c')
| -rw-r--r-- | kernel/vmem.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/kernel/vmem.c b/kernel/vmem.c index a388535..704b45e 100644 --- a/kernel/vmem.c +++ b/kernel/vmem.c @@ -332,7 +332,7 @@ static void vmem_add_identity(pdirectory* dir,uint32_t addr,uint32_t pages, bool vmem_add_generic(dir,addr,addr,pages, false,user); } -pdirectory* vmem_kernel_dir() +pdirectory* vmem_kernel_dir() // we create thie once for each cpu { fixme("remove user flags where appropriate"); fixme("do not waste soo many pages/page tables!"); @@ -346,7 +346,7 @@ pdirectory* vmem_kernel_dir() vmem_add_identity(dir,VMEM_KERNEL,VMEM_KERNEL_PAGES,false);//identity map first 32 megs... vmem_add_identity(dir,e1000_addr,32,false);//identity map 32 pages for e1000 - vmem_add_remap(dir,fb_addr,VMEM_FRAMEBUFFER,VMEM_FRAMEBUFFER_PAGES,true);//32megs should be enough for 4k (think about pitch) + vmem_add_remap(dir,fb_addr,VMEM_FRAMEBUFFER,VMEM_FRAMEBUFFER_PAGES,false);//32megs should be enough for 4k (think about pitch) vmem_add_remap(dir,local_apic_addr,VMEM_LAPIC,1,false); //apic addr should be at pagestart, right? TODO: check. vmem_add_remap(dir,io_apic_addr,VMEM_IOAPIC,1,false); @@ -359,14 +359,14 @@ pdirectory* vmem_kernel_dir() vmem_add_alloc(dir,VMEM_USER_ENV,1,true); vmem_add_alloc(dir,VMEM_USER_NEWLIB,1,true); vmem_add_alloc(dir,VMEM_USER_STACK_TOP-4096*VMEM_USER_STACK_PAGES,VMEM_USER_STACK_PAGES,true); -// vmem_add_alloc(dir,VMEM_USER_FRAMEBUFFER,VMEM_USER_FRAMEBUFFER_PAGES,true); /// each new process gets a 640x480x32 area + //vmem_add_alloc(dir,VMEM_USER_FRAMEBUFFER,VMEM_USER_FRAMEBUFFER_PAGES,true); /// each new process gets a 640x480x32 area return dir; } void vmem_add_framebuffer(pdirectory *dir) { - //vmem_del_generic(dir,VMEM_USER_FRAMEBUFFER,VMEM_USER_FRAMEBUFFER_PAGES,false, true); +// vmem_del_generic(dir,VMEM_USER_FRAMEBUFFER,VMEM_USER_FRAMEBUFFER_PAGES,false, true); vmem_add_alloc(dir, VMEM_USER_FRAMEBUFFER,VMEM_USER_FRAMEBUFFER_PAGES,true); /// each new process gets a 640x480x32 area } @@ -481,7 +481,8 @@ pdirectory* vmem_new_space_dir(pdirectory *copy_dir,bool stack_only) if(virt>=VMEM_USER_FRAMEBUFFER&&virt<VMEM_USER_FRAMEBUFFER+VMEM_USER_FRAMEBUFFER_PAGES*4096) { // and for now we all share this! // - vmem_add_remap(dir,src_phys,virt,1,true); + // or not! + //vmem_add_remap(dir,src_phys,virt,1,true); } else{ |