From 1d673e7e628db462215abcec06641063a6165b9b Mon Sep 17 00:00:00 2001 From: Aleksa Vuckovic Date: Thu, 8 Sep 2022 15:09:30 +0200 Subject: fixed output glitches --- kernel/include/graphics.h | 16 ++++++++-------- kernel/include/libk/stdio.h | 4 ++++ 2 files changed, 12 insertions(+), 8 deletions(-) (limited to 'kernel/include') diff --git a/kernel/include/graphics.h b/kernel/include/graphics.h index e974781..4e4fc48 100644 --- a/kernel/include/graphics.h +++ b/kernel/include/graphics.h @@ -13,7 +13,7 @@ struct fb_t { } __attribute__((packed, aligned(8))); typedef struct fb_t fb_t; -extern fb_t main_fb; +extern volatile fb_t main_fb; #define RED 0x00ff0000 #define GREEN 0x0000ff00 @@ -23,12 +23,12 @@ extern fb_t main_fb; #define WHITE 0x00ffffff #define BLACK 0x00000000 -uint32_t* pixel_offset(fb_t fb, uint32_t x, uint32_t y); -void fb_draw_pixel(fb_t fb, int32_t x, int32_t y, uint32_t col); -void fb_draw_line_low(fb_t fb, int32_t x0, int32_t y0, int32_t x1, int32_t y1, uint32_t col); -void fb_draw_line_high(fb_t fb, int32_t x0, int32_t y0, int32_t x1, int32_t y1, uint32_t col); -void fb_draw_line(fb_t fb, int32_t x0, int32_t y0, int32_t x1, int32_t y1, uint32_t col); -void fb_draw_character(fb_t fb, char c, int32_t x, int32_t y, uint32_t char_col, uint32_t bg_col); -void fb_draw_string(fb_t fb, const char* str, int32_t x, int32_t y, uint32_t char_col, uint32_t bg_col); +uint32_t* pixel_offset(volatile fb_t fb, uint32_t x, uint32_t y); +void fb_draw_pixel(volatile fb_t fb, int32_t x, int32_t y, uint32_t col); +void fb_draw_line_low(volatile fb_t fb, int32_t x0, int32_t y0, int32_t x1, int32_t y1, uint32_t col); +void fb_draw_line_high(volatile fb_t fb, int32_t x0, int32_t y0, int32_t x1, int32_t y1, uint32_t col); +void fb_draw_line(volatile fb_t fb, int32_t x0, int32_t y0, int32_t x1, int32_t y1, uint32_t col); +void fb_draw_character(volatile fb_t fb, char c, int32_t x, int32_t y, uint32_t char_col, uint32_t bg_col); +void fb_draw_string(volatile fb_t fb, const char* str, int32_t x, int32_t y, uint32_t char_col, uint32_t bg_col); #endif diff --git a/kernel/include/libk/stdio.h b/kernel/include/libk/stdio.h index 99064f9..fc7b8e8 100644 --- a/kernel/include/libk/stdio.h +++ b/kernel/include/libk/stdio.h @@ -6,6 +6,10 @@ extern uint32_t curr_x; extern uint32_t curr_y; +void print_char(char c); +void print_string(const char* s); +void print_int(uint64_t num); +void print_hex(uint64_t num); void printf(const char *s, ...); #endif -- cgit v1.2.3