diff options
| author | Michal Idziorek <m.i@gmx.at> | 2015-05-18 00:48:07 +0200 |
|---|---|---|
| committer | Michal Idziorek <m.i@gmx.at> | 2015-05-18 00:48:07 +0200 |
| commit | db22b587966b4a4eaa47536f32ca812532446bcb (patch) | |
| tree | b6d471f5232973713ef64d9c81feefef51ee5eaf /driver | |
| parent | 042e25e19b5fc0cec1d47440c26246c886cf39f6 (diff) | |
heavy refactoring underway
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/console.c | 33 | ||||
| -rw-r--r-- | driver/keyboard.c | 2 |
2 files changed, 17 insertions, 18 deletions
diff --git a/driver/console.c b/driver/console.c index b6958c5..fcbf6e1 100644 --- a/driver/console.c +++ b/driver/console.c @@ -36,7 +36,6 @@ static void print_char_col(int x, int y, char c, char col) // glue func for vt52 terminal void console_put_char(uint8_t c,uint8_t color, uint32_t x, uint32_t y) { - print_char_col(x,y,c, color); } // @@ -132,22 +131,6 @@ static void scr_nextline() #endif } -static void scr_put_char(char ch,char col) -{ - - if(ch=='\n')scr_nextline(); - else if(posx<SCR_WIDTH) - { - print_char_col(posx,posy,ch,col); - posx++; - } - -#ifdef FOOLOS_CONSOLE_AUTOBREAK - if(posx>=SCR_WIDTH)scr_nextline(); -#endif - -} - /* void scr_put_hex(uint16_t val) { @@ -178,6 +161,22 @@ void scr_put_hex32(uint32_t val) } */ +static void scr_put_char(char ch,char col) +{ + + if(ch=='\n')scr_nextline(); + else if(posx<SCR_WIDTH) + { + print_char_col(posx,posy,ch,col); + posx++; + } + +#ifdef FOOLOS_CONSOLE_AUTOBREAK + if(posx>=SCR_WIDTH)scr_nextline(); +#endif + +} + static void scr_put_string(char *str, char col) { while(*str!=0) diff --git a/driver/keyboard.c b/driver/keyboard.c index 4366127..2323b04 100644 --- a/driver/keyboard.c +++ b/driver/keyboard.c @@ -2,7 +2,7 @@ #define FOOLOS_MODULE_NAME "keyboard" -#include "x86.h" +#include "kernel/x86.h" /// idiots keyboard driver //// // http://www.computer-engineering.org/ps2keyboard/scancodes1.html |