summaryrefslogtreecommitdiff
path: root/kernel/console.c
diff options
context:
space:
mode:
authorMichal Idziorek <m.i@gmx.at>2014-12-09 01:47:36 +0100
committerMichal Idziorek <m.i@gmx.at>2014-12-09 01:47:36 +0100
commit7e965f276c47d29969f5470533d40df03536d190 (patch)
tree36f159e7a8ae31274a51e721d00ce6d9a40d63ba /kernel/console.c
parent40aef7cf75fe26aa34207bc2afa2bfaa211e354f (diff)
experimenting with VESA modes
Diffstat (limited to 'kernel/console.c')
-rw-r--r--kernel/console.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/console.c b/kernel/console.c
index e0e70a3..f363d9e 100644
--- a/kernel/console.c
+++ b/kernel/console.c
@@ -13,11 +13,12 @@
#include "video/console.h"
-void console_init(){
+uint32_t console_init(){
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();}
void console_put_char_gray(char c){scr_put_char(c,SCR_GRAY2);}
@@ -38,6 +39,7 @@ void console_init(){
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);
+ return vesa_physbase;
}
void console_del_char(char c){PutConsoleChar('*',0xffffff);}