diff options
Diffstat (limited to 'firmware/target/coldfire')
-rw-r--r-- | firmware/target/coldfire/iaudio/m3/lcd-m3.c | 6 | ||||
-rw-r--r-- | firmware/target/coldfire/iaudio/m5/lcd-m5.c | 6 | ||||
-rw-r--r-- | firmware/target/coldfire/iriver/h100/lcd-h100.c | 6 | ||||
-rw-r--r-- | firmware/target/coldfire/mpio/hd300/lcd-hd300.c | 3 |
4 files changed, 14 insertions, 7 deletions
diff --git a/firmware/target/coldfire/iaudio/m3/lcd-m3.c b/firmware/target/coldfire/iaudio/m3/lcd-m3.c index 3da608a0ef..5e84cbacd3 100644 --- a/firmware/target/coldfire/iaudio/m3/lcd-m3.c +++ b/firmware/target/coldfire/iaudio/m3/lcd-m3.c | |||
@@ -258,6 +258,7 @@ void lcd_update(void) | |||
258 | int y; | 258 | int y; |
259 | if (initialized) | 259 | if (initialized) |
260 | { | 260 | { |
261 | void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn; | ||
261 | for(y = 0;y < LCD_FBHEIGHT;y++) | 262 | for(y = 0;y < LCD_FBHEIGHT;y++) |
262 | { | 263 | { |
263 | /* Copy display bitmap to hardware. | 264 | /* Copy display bitmap to hardware. |
@@ -266,7 +267,7 @@ void lcd_update(void) | |||
266 | have to update one page at a time. */ | 267 | have to update one page at a time. */ |
267 | lcd_write_command(LCD_SET_PAGE | (y > 5 ? y + 2 : y)); | 268 | lcd_write_command(LCD_SET_PAGE | (y > 5 ? y + 2 : y)); |
268 | lcd_write_command_e(LCD_SET_COLUMN | 0, 0); | 269 | lcd_write_command_e(LCD_SET_COLUMN | 0, 0); |
269 | lcd_write_data(FBADDR(0, y), LCD_WIDTH); | 270 | lcd_write_data(fbaddr(0,y), LCD_WIDTH); |
270 | } | 271 | } |
271 | } | 272 | } |
272 | } | 273 | } |
@@ -289,6 +290,7 @@ void lcd_update_rect(int x, int y, int width, int height) | |||
289 | if(ymax >= LCD_FBHEIGHT) | 290 | if(ymax >= LCD_FBHEIGHT) |
290 | ymax = LCD_FBHEIGHT-1; | 291 | ymax = LCD_FBHEIGHT-1; |
291 | 292 | ||
293 | void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn; | ||
292 | /* Copy specified rectangle bitmap to hardware | 294 | /* Copy specified rectangle bitmap to hardware |
293 | COM48-COM63 are not connected, so we need to skip those */ | 295 | COM48-COM63 are not connected, so we need to skip those */ |
294 | for (; y <= ymax; y++) | 296 | for (; y <= ymax; y++) |
@@ -296,7 +298,7 @@ void lcd_update_rect(int x, int y, int width, int height) | |||
296 | lcd_write_command(LCD_SET_PAGE | ((y > 5 ? y + 2 : y) & 0xf)); | 298 | lcd_write_command(LCD_SET_PAGE | ((y > 5 ? y + 2 : y) & 0xf)); |
297 | lcd_write_command_e(LCD_SET_COLUMN | ((x >> 4) & 0xf), x & 0xf); | 299 | lcd_write_command_e(LCD_SET_COLUMN | ((x >> 4) & 0xf), x & 0xf); |
298 | 300 | ||
299 | lcd_write_data(FBADDR(x,y), width); | 301 | lcd_write_data(fbaddr(x,y), width); |
300 | } | 302 | } |
301 | } | 303 | } |
302 | } | 304 | } |
diff --git a/firmware/target/coldfire/iaudio/m5/lcd-m5.c b/firmware/target/coldfire/iaudio/m5/lcd-m5.c index 8f022adf96..35fd173f18 100644 --- a/firmware/target/coldfire/iaudio/m5/lcd-m5.c +++ b/firmware/target/coldfire/iaudio/m5/lcd-m5.c | |||
@@ -200,6 +200,7 @@ void lcd_update(void) | |||
200 | { | 200 | { |
201 | int y; | 201 | int y; |
202 | 202 | ||
203 | void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn; | ||
203 | /* Copy display bitmap to hardware */ | 204 | /* Copy display bitmap to hardware */ |
204 | for (y = 0; y < LCD_FBHEIGHT; y++) | 205 | for (y = 0; y < LCD_FBHEIGHT; y++) |
205 | { | 206 | { |
@@ -207,7 +208,7 @@ void lcd_update(void) | |||
207 | lcd_write_command_ex(LCD_CNTL_COLUMN, 0, -1); | 208 | lcd_write_command_ex(LCD_CNTL_COLUMN, 0, -1); |
208 | 209 | ||
209 | lcd_write_command(LCD_CNTL_DATA_WRITE); | 210 | lcd_write_command(LCD_CNTL_DATA_WRITE); |
210 | lcd_write_data (FBADDR(0, y), LCD_WIDTH); | 211 | lcd_write_data (fbaddr(0,y), LCD_WIDTH); |
211 | } | 212 | } |
212 | } | 213 | } |
213 | 214 | ||
@@ -228,6 +229,7 @@ void lcd_update_rect(int x, int y, int width, int height) | |||
228 | if(ymax >= LCD_FBHEIGHT) | 229 | if(ymax >= LCD_FBHEIGHT) |
229 | ymax = LCD_FBHEIGHT-1; | 230 | ymax = LCD_FBHEIGHT-1; |
230 | 231 | ||
232 | void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn; | ||
231 | /* Copy specified rectange bitmap to hardware */ | 233 | /* Copy specified rectange bitmap to hardware */ |
232 | for (; y <= ymax; y++) | 234 | for (; y <= ymax; y++) |
233 | { | 235 | { |
@@ -235,6 +237,6 @@ void lcd_update_rect(int x, int y, int width, int height) | |||
235 | lcd_write_command_ex(LCD_CNTL_COLUMN, x, -1); | 237 | lcd_write_command_ex(LCD_CNTL_COLUMN, x, -1); |
236 | 238 | ||
237 | lcd_write_command(LCD_CNTL_DATA_WRITE); | 239 | lcd_write_command(LCD_CNTL_DATA_WRITE); |
238 | lcd_write_data (FBADDR(x,y), width); | 240 | lcd_write_data (fbaddr(x,y), width); |
239 | } | 241 | } |
240 | } | 242 | } |
diff --git a/firmware/target/coldfire/iriver/h100/lcd-h100.c b/firmware/target/coldfire/iriver/h100/lcd-h100.c index b13751b9eb..b6eea1dfa3 100644 --- a/firmware/target/coldfire/iriver/h100/lcd-h100.c +++ b/firmware/target/coldfire/iriver/h100/lcd-h100.c | |||
@@ -209,6 +209,7 @@ void lcd_update(void) | |||
209 | { | 209 | { |
210 | int y; | 210 | int y; |
211 | 211 | ||
212 | void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn; | ||
212 | /* Copy display bitmap to hardware */ | 213 | /* Copy display bitmap to hardware */ |
213 | for (y = 0; y < LCD_FBHEIGHT; y++) | 214 | for (y = 0; y < LCD_FBHEIGHT; y++) |
214 | { | 215 | { |
@@ -216,7 +217,7 @@ void lcd_update(void) | |||
216 | lcd_write_command_ex(LCD_CNTL_COLUMN, 0, -1); | 217 | lcd_write_command_ex(LCD_CNTL_COLUMN, 0, -1); |
217 | 218 | ||
218 | lcd_write_command(LCD_CNTL_DATA_WRITE); | 219 | lcd_write_command(LCD_CNTL_DATA_WRITE); |
219 | lcd_write_data (FBADDR(0, y), LCD_WIDTH); | 220 | lcd_write_data (fbaddr(0,y), LCD_WIDTH); |
220 | } | 221 | } |
221 | } | 222 | } |
222 | 223 | ||
@@ -237,6 +238,7 @@ void lcd_update_rect(int x, int y, int width, int height) | |||
237 | if(ymax >= LCD_FBHEIGHT) | 238 | if(ymax >= LCD_FBHEIGHT) |
238 | ymax = LCD_FBHEIGHT-1; | 239 | ymax = LCD_FBHEIGHT-1; |
239 | 240 | ||
241 | void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn; | ||
240 | /* Copy specified rectange bitmap to hardware */ | 242 | /* Copy specified rectange bitmap to hardware */ |
241 | for (; y <= ymax; y++) | 243 | for (; y <= ymax; y++) |
242 | { | 244 | { |
@@ -244,6 +246,6 @@ void lcd_update_rect(int x, int y, int width, int height) | |||
244 | lcd_write_command_ex(LCD_CNTL_COLUMN, x, -1); | 246 | lcd_write_command_ex(LCD_CNTL_COLUMN, x, -1); |
245 | 247 | ||
246 | lcd_write_command(LCD_CNTL_DATA_WRITE); | 248 | lcd_write_command(LCD_CNTL_DATA_WRITE); |
247 | lcd_write_data (FBADDR(x,y), width); | 249 | lcd_write_data (fbaddr(x,y), width); |
248 | } | 250 | } |
249 | } | 251 | } |
diff --git a/firmware/target/coldfire/mpio/hd300/lcd-hd300.c b/firmware/target/coldfire/mpio/hd300/lcd-hd300.c index 509ed4cd53..9cff9cd712 100644 --- a/firmware/target/coldfire/mpio/hd300/lcd-hd300.c +++ b/firmware/target/coldfire/mpio/hd300/lcd-hd300.c | |||
@@ -231,6 +231,7 @@ void lcd_update_rect(int x, int y, int width, int height) | |||
231 | if(ymax >= LCD_FBHEIGHT) | 231 | if(ymax >= LCD_FBHEIGHT) |
232 | ymax = LCD_FBHEIGHT-1; | 232 | ymax = LCD_FBHEIGHT-1; |
233 | 233 | ||
234 | void* (*fbaddr)(int x, int y) = FB_CURRENTVP_BUFFER->get_address_fn; | ||
234 | /* Copy specified rectange bitmap to hardware */ | 235 | /* Copy specified rectange bitmap to hardware */ |
235 | for (; y <= ymax; y++) | 236 | for (; y <= ymax; y++) |
236 | { | 237 | { |
@@ -238,6 +239,6 @@ void lcd_update_rect(int x, int y, int width, int height) | |||
238 | lcd_write_command_ex(LCD_CNTL_COLUMN, x, -1); | 239 | lcd_write_command_ex(LCD_CNTL_COLUMN, x, -1); |
239 | 240 | ||
240 | lcd_write_command(LCD_CNTL_DATA_WRITE); | 241 | lcd_write_command(LCD_CNTL_DATA_WRITE); |
241 | lcd_write_data (FBADDR(x,y), width); | 242 | lcd_write_data (fbaddr(x,y), width); |
242 | } | 243 | } |
243 | } | 244 | } |