From b37e6bc8c119289aca8740dd5e3b60d72f9d6b40 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Wed, 22 Feb 2012 21:18:05 +1100 Subject: lcd drivers: Convert lcd_[remote_]framebuffer to a pointer Change all lcd drivers to using a pointer to the static framebuffer instead of directly accessing the static array. This will let us later do fun things like dynamic framebuffer sizes (RaaA) or ability to use different buffers for different layers (dynamic skin backdrops!) Change-Id: I0a4d58a9d7b55e6c932131b929e5d4c9f9414b06 --- firmware/target/arm/as3525/lcd-fuze.c | 2 +- firmware/target/arm/as3525/lcd-ssd1303.c | 4 ++-- firmware/target/arm/as3525/sansa-clipzip/lcd-clipzip.c | 2 +- firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'firmware/target/arm/as3525') diff --git a/firmware/target/arm/as3525/lcd-fuze.c b/firmware/target/arm/as3525/lcd-fuze.c index 2acc7b3bf9..b2033738b6 100644 --- a/firmware/target/arm/as3525/lcd-fuze.c +++ b/firmware/target/arm/as3525/lcd-fuze.c @@ -332,7 +332,7 @@ void lcd_update_rect(int x, int y, int width, int height) lcd_write_cmd(R_WRITE_DATA_2_GRAM); - ptr = &lcd_framebuffer[y][x]; + ptr = FBADDR(x,y); do { diff --git a/firmware/target/arm/as3525/lcd-ssd1303.c b/firmware/target/arm/as3525/lcd-ssd1303.c index 213f12a424..9fcc85d243 100644 --- a/firmware/target/arm/as3525/lcd-ssd1303.c +++ b/firmware/target/arm/as3525/lcd-ssd1303.c @@ -273,7 +273,7 @@ void lcd_update(void) lcd_write_command (LCD_CNTL_HIGHCOL | ((offset >> 4) & 0xf)); lcd_write_command (LCD_CNTL_LOWCOL | (offset & 0xf)); - lcd_write_data (lcd_framebuffer[y], LCD_WIDTH); + lcd_write_data (FBADDR(0, y), LCD_WIDTH); } } @@ -304,6 +304,6 @@ void lcd_update_rect(int x, int y, int width, int height) lcd_write_command (LCD_CNTL_HIGHCOL | (((x+offset) >> 4) & 0xf)); lcd_write_command (LCD_CNTL_LOWCOL | ((x+offset) & 0xf)); - lcd_write_data (&lcd_framebuffer[y][x], width); + lcd_write_data (FBADDR(x,y), width); } } diff --git a/firmware/target/arm/as3525/sansa-clipzip/lcd-clipzip.c b/firmware/target/arm/as3525/sansa-clipzip/lcd-clipzip.c index 3952171e7e..7673b529cc 100644 --- a/firmware/target/arm/as3525/sansa-clipzip/lcd-clipzip.c +++ b/firmware/target/arm/as3525/sansa-clipzip/lcd-clipzip.c @@ -426,7 +426,7 @@ void lcd_update_rect(int x, int y, int width, int height) /* write to GRAM */ for (row = y; row < y_end; row++) { - lcd_write_data(&lcd_framebuffer[row][x], width); + lcd_write_data(FBADDR(x,row), width); } } diff --git a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c index f875b40c05..2c80f89ff7 100644 --- a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c +++ b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c @@ -488,7 +488,7 @@ void lcd_update_rect(int x, int y, int width, int height) lcd_window(x, y, x+width-1, y+height-1); lcd_write_cmd(R_WRITE_DATA_2_GRAM); - ptr = &lcd_framebuffer[y][x]; + ptr = FBADDR(x,y); do { -- cgit v1.2.3