From a7ca82133bcb8139bb9d11aa717657ef42ab6cfe Mon Sep 17 00:00:00 2001 From: Miguel Date: Mon, 10 Sep 2018 22:31:48 +0200 Subject: fixed bug in asm_pit_rate_ --- driver/timer.c | 4 ++-- driver/vesa.c | 2 +- driver/vesa.h | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'driver') diff --git a/driver/timer.c b/driver/timer.c index 7e95afe..7f9859c 100644 --- a/driver/timer.c +++ b/driver/timer.c @@ -153,8 +153,8 @@ uint64_t timer_init() { uint64_t epoch_time=get_rtc_time(); task_system_clock_start=epoch_time*25; // since pit ticks 25times a second - asm_pit_rate_40ms(); - fixme("pit rate once did not work anymore 1/25 seconds?? but now ok?" ); + asm_pit_rate_40ms(); //tick at 25hz + fixme("pit rate does only seem to work occasionally.. 1/25 seconds???" ); return epoch_time; } diff --git a/driver/vesa.c b/driver/vesa.c index bdf1c9a..eb99173 100644 --- a/driver/vesa.c +++ b/driver/vesa.c @@ -234,7 +234,7 @@ void PutString(char *str, int x,int y, int color, va_list va) int i=x; while((*str)!=0) { - //PutFont(*str, i,y, color); + PutFont(*str, i,y, color,0x0); i+=9; // spacing str++; } diff --git a/driver/vesa.h b/driver/vesa.h index 7122d68..168013f 100644 --- a/driver/vesa.h +++ b/driver/vesa.h @@ -1,4 +1,5 @@ #include +#include "lib/printf/printf.h" void vesa_update_cursor(uint32_t col,uint32_t row); void vesa_console_put_char(uint8_t c,uint8_t color_bg, uint8_t color_fg, uint32_t x, uint32_t y); @@ -50,3 +51,4 @@ void PutConsoleChar(char c, int color); void PutConsole(char *str, int color); void vesa_put_rect(int x, int y, int w , int h, int color); void PutFont(char c, int x,int y, int color_fg,int color_bg); +void PutString(char *str, int x,int y, int color, va_list va); -- cgit v1.2.3