From 48bdc0e58fa036d6551fe216daaa6dbb390b8c82 Mon Sep 17 00:00:00 2001 From: Michal Idziorek Date: Tue, 8 Jul 2014 18:13:26 +0200 Subject: some cleanup --- kernel/console.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'kernel/console.h') diff --git a/kernel/console.h b/kernel/console.h index b834289..a8b2b86 100644 --- a/kernel/console.h +++ b/kernel/console.h @@ -1,3 +1,8 @@ +#ifndef CONSOLE_H +#define CONSOLE_H + +#include //needed for uint16_t + #define SCR_VIDEOMEM 0xb8000 #define SCR_WIDTH 80 @@ -13,17 +18,13 @@ #define SCR_RED 0x4 // TODO: more colors here... - # define SCR_WHITE 0xf //autoscroll -void print_nextline(); -void print_string(char *str); -void print_hex(uint16_t val); -void console_clear_screen(); - -//no autoscroll -void print_str(int x,int y,char *str); -void print_str_col(int x,int y,char *str, char col); -void print_char(int x, int y, char c); -void print_char_col(int x, int y, char c, char col); +void scr_clear(); +void scr_nextline(); +void scr_put_string(char *str); +void scr_put_hex(uint16_t val); +//void scr_put_int(uint16_t int); + +#endif -- cgit v1.2.3