From f5297ff820a532c04a4f01398b3c571070a3f0b4 Mon Sep 17 00:00:00 2001 From: Aleksa Vuckovic Date: Sat, 28 Jan 2023 21:16:34 +0100 Subject: unnecessary volatile --- kernel/include/graphics.h | 16 ++++++++-------- kernel/src/misc/graphics.c | 18 +++++++++--------- 2 files changed, 17 insertions(+), 17 deletions(-) (limited to 'kernel') diff --git a/kernel/include/graphics.h b/kernel/include/graphics.h index 6f6f432..f19a579 100644 --- a/kernel/include/graphics.h +++ b/kernel/include/graphics.h @@ -17,7 +17,7 @@ struct fb_t { }; typedef struct fb_t fb_t; -extern volatile fb_t main_fb; +extern fb_t main_fb; #define RED 0x00ff0000 #define GREEN 0x0000ff00 @@ -27,12 +27,12 @@ extern volatile fb_t main_fb; #define WHITE 0x00ffffff #define BLACK 0x00000000 -void set_color(volatile fb_t* fb, uint32_t char_col, uint32_t bg_col); -void clear_screen(volatile fb_t fb); -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); +void set_color(fb_t* fb, uint32_t char_col, uint32_t bg_col); +void clear_screen(fb_t fb); +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); #endif diff --git a/kernel/src/misc/graphics.c b/kernel/src/misc/graphics.c index 92fa9c5..33dd441 100644 --- a/kernel/src/misc/graphics.c +++ b/kernel/src/misc/graphics.c @@ -6,25 +6,25 @@ #include #include -volatile fb_t main_fb; +fb_t main_fb; -void fb_draw_pixel(volatile fb_t fb, int32_t x, int32_t y, uint32_t col) +void fb_draw_pixel(fb_t fb, int32_t x, int32_t y, uint32_t col) { if (x < 0 || y < 0) return; if (x >= (int32_t)fb.width || y >= (int32_t)fb.height) return; uint32_t fb_offset = (uint32_t)y * fb.pitch + (uint32_t)x * fb.bpp / 8; - uint32_t* fb_buff = (uint32_t*)fb.addr; + volatile uint32_t* fb_buff = (uint32_t*)fb.addr; fb_buff[fb_offset / 4] = col; } -void set_color(volatile fb_t* fb, uint32_t char_col, uint32_t bg_col) +void set_color(fb_t* fb, uint32_t char_col, uint32_t bg_col) { fb->char_col = char_col; fb->bg_col = bg_col; } -void clear_screen(volatile fb_t fb) +void clear_screen(fb_t fb) { for (size_t i = 0; i < fb.height; i++) { for (size_t j = 0; j < fb.width; j++) { @@ -37,7 +37,7 @@ void clear_screen(volatile fb_t fb) /* https://en.wikipedia.org/wiki/Bresenham%27s_line_algorithm */ -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_low(fb_t fb, int32_t x0, int32_t y0, int32_t x1, int32_t y1, uint32_t col) { int32_t dx = x1 - x0; int32_t dy = y1 - y0; @@ -61,7 +61,7 @@ void fb_draw_line_low(volatile fb_t fb, int32_t x0, int32_t y0, int32_t x1, int3 } -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_high(fb_t fb, int32_t x0, int32_t y0, int32_t x1, int32_t y1, uint32_t col) { int32_t dx = x1 - x0; int32_t dy = y1 - y0; @@ -84,7 +84,7 @@ void fb_draw_line_high(volatile fb_t fb, int32_t x0, int32_t y0, int32_t x1, int } } -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_line(fb_t fb, int32_t x0, int32_t y0, int32_t x1, int32_t y1, uint32_t col) { if (abs(y1 - y0) < abs(x1 - x0)) { if (x0 > x1) @@ -99,7 +99,7 @@ void fb_draw_line(volatile fb_t fb, int32_t x0, int32_t y0, int32_t x1, int32_t } } -void fb_draw_character(volatile fb_t fb, char c, int32_t x, int32_t y) +void fb_draw_character(fb_t fb, char c, int32_t x, int32_t y) { if (c < 0) return; -- cgit v1.2.3