experimenting with grub vbe

1 files changed, 7 insertions, 6 deletions

diff --git a/kernel/console.c b/kernel/console.c
index 9db1c0b..c33c205 100644
--- a/kernel/console.c
+++ b/kernel/console.c
@@ -13,11 +13,9 @@
 
 #include "video/console.h"
 
-uint32_t console_init(){
+uint32_t console_init(uint32_t mode, uint32_t control){
     scr_clear();
     log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"init console");
-//int inode_nr=ext2_filename_to_inode(EXT2_RAM_ADDRESS,"/binfont.bin");
- //   if(inode_nr!=-1)ext2_inode_content(EXT2_RAM_ADDRESS,inode_nr,0x8000000,0xffff); // load font;
     return 0;
 }
 void console_del_char(){scr_backspace();}
@@ -34,11 +32,12 @@ void console_put_str_red(char *s){scr_put_string(s,SCR_RED);}
 
 #include "video/vesa.h"
 
-uint32_t console_init(){
+uint32_t console_init(uint32_t mode, uint32_t control){
 
     int inode_nr=ext2_filename_to_inode(EXT2_RAM_ADDRESS,"/binfont.bin");
-    if(inode_nr!=-1)ext2_inode_content(EXT2_RAM_ADDRESS,inode_nr,0x1300000,0xffff); // load font;
-    uint32_t vesa_physbase=vesa_init(0xb000,0xc000,0x1300000);
+    ext2_inode_content(EXT2_RAM_ADDRESS,inode_nr,0x700000,0xffff); // load font;
+    //uint32_t vesa_physbase=vesa_init(0xb000,0xc000,0x700000);
+    uint32_t vesa_physbase=vesa_init(mode,control,0x700000);
     return vesa_physbase;
 }
 
@@ -55,3 +54,5 @@ void console_put_str_green(char *s){PutConsole(s,0xffffff);}
 void console_put_str_red(char *s){PutConsole(s,0xffffff);}
 
 #endif
+
+