diff options
Diffstat (limited to 'src/boucane.cc')
| -rw-r--r-- | src/boucane.cc | 39 |
1 files changed, 9 insertions, 30 deletions
diff --git a/src/boucane.cc b/src/boucane.cc index 791c5cc..0209281 100644 --- a/src/boucane.cc +++ b/src/boucane.cc @@ -8,25 +8,19 @@ #include "drivers/framebuffer.hpp" #include "libs/stdio.hpp" #include "core/asm.hpp" -extern u32 MB_INFO; -extern u64 res_binary_res_terminus_psf_start; - - - - - +extern u32 MB_INFO; +extern u64 res_binary_res_terminus_psf_start; extern "C" void boucane(){ - //clear(); - //printk("Booting Boucane v%d.%d.%d\n",VERSION_MAJOR,VERSION_MINOR, VERSION_PATH); - //idt_enable_interrupt(); - + // Init data structures + LOAD_GDT(); paging_enable(); + idt_enable_interrupt(); FRAMEBUFFER fb_info; - if(mb2_find_framebuffer((u32*)MB_INFO, &fb_info)){ + if(mb2_find_framebuffer((u32*)&MB_INFO, &fb_info)){ if(fb_info.bpp>16){ FB_CFG conf; conf.depth=fb_info.bpp; @@ -39,25 +33,10 @@ extern "C" void boucane(){ __putchar=psf_putchar; } } + vga_t_init(); + vga_t_clear(); printk("Booting Boucane v%d.%d.%d\n",VERSION_MAJOR,VERSION_MINOR, VERSION_PATH); - printk("Jean"); - - printk("Loic"); - //framebuffer_clear(); - //apic_enable(); - -/* u64 p; - u32 size; - if(mb2_find_old_rsdp((u32*)MB_INFO,&p,&size)){ - acpi_init((void*)p); - }*/ - //FRAMEBUFFER fb; - //if(mb2_find_framebuffer((u32*)MB_INFO, &fb)){ - //printk("Framebuffer found!"); - //framebuffer_init(fb.addr, fb.pitch, fb.bpp); - //__putchar=psf_print; - //printk("Hello"); - //} + while(1); }
\ No newline at end of file |