diff options
Diffstat (limited to 'firmware/target/arm/tms320dm320')
4 files changed, 9 insertions, 9 deletions
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c index 204a99f87c..5f623dc239 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c +++ b/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c | |||
@@ -380,7 +380,7 @@ void lcd_update_rect(int x, int y, int width, int height) | |||
380 | 380 | ||
381 | #if CONFIG_ORIENTATION == SCREEN_PORTRAIT | 381 | #if CONFIG_ORIENTATION == SCREEN_PORTRAIT |
382 | dst = (fb_data *)FRAME + LCD_WIDTH*y + x; | 382 | dst = (fb_data *)FRAME + LCD_WIDTH*y + x; |
383 | src = &lcd_framebuffer[y][x]; | 383 | src = FBADDR(x,y); |
384 | 384 | ||
385 | /* Copy part of the Rockbox framebuffer to the second framebuffer */ | 385 | /* Copy part of the Rockbox framebuffer to the second framebuffer */ |
386 | if (width < LCD_WIDTH) | 386 | if (width < LCD_WIDTH) |
@@ -394,7 +394,7 @@ void lcd_update_rect(int x, int y, int width, int height) | |||
394 | lcd_copy_buffer_rect(dst, src, LCD_WIDTH*height, 1); | 394 | lcd_copy_buffer_rect(dst, src, LCD_WIDTH*height, 1); |
395 | } | 395 | } |
396 | #else | 396 | #else |
397 | src = &lcd_framebuffer[y][x]; | 397 | src = FBADDR(x,y); |
398 | 398 | ||
399 | register int xc, yc; | 399 | register int xc, yc; |
400 | register fb_data *start=FRAME + LCD_HEIGHT*(LCD_WIDTH-x-1) + y + 1; | 400 | register fb_data *start=FRAME + LCD_HEIGHT*(LCD_WIDTH-x-1) + y + 1; |
@@ -419,7 +419,7 @@ void lcd_update(void) | |||
419 | if (!lcd_on || direct_fb_access) | 419 | if (!lcd_on || direct_fb_access) |
420 | return; | 420 | return; |
421 | #if CONFIG_ORIENTATION == SCREEN_PORTRAIT | 421 | #if CONFIG_ORIENTATION == SCREEN_PORTRAIT |
422 | lcd_copy_buffer_rect((fb_data *)FRAME, &lcd_framebuffer[0][0], | 422 | lcd_copy_buffer_rect((fb_data *)FRAME, FBADDR(0,0), |
423 | LCD_WIDTH*LCD_HEIGHT, 1); | 423 | LCD_WIDTH*LCD_HEIGHT, 1); |
424 | #else | 424 | #else |
425 | lcd_update_rect(0, 0, LCD_WIDTH, LCD_HEIGHT); | 425 | lcd_update_rect(0, 0, LCD_WIDTH, LCD_HEIGHT); |
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c index 38631401f9..c3a96a3efd 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c | |||
@@ -500,12 +500,12 @@ void lcd_update_rect(int x, int y, int width, int height) | |||
500 | if (width < LCD_WIDTH) | 500 | if (width < LCD_WIDTH) |
501 | { | 501 | { |
502 | /* Not full width - do line-by-line */ | 502 | /* Not full width - do line-by-line */ |
503 | lcd_copy_buffer_rect(dst, &lcd_framebuffer[y][x], width, height); | 503 | lcd_copy_buffer_rect(dst, FBADDR(x,y), width, height); |
504 | } | 504 | } |
505 | else | 505 | else |
506 | { | 506 | { |
507 | /* Full width - copy as one line */ | 507 | /* Full width - copy as one line */ |
508 | lcd_copy_buffer_rect(dst, &lcd_framebuffer[y][x], LCD_WIDTH*height, 1); | 508 | lcd_copy_buffer_rect(dst, FBADDR(x,y), LCD_WIDTH*height, 1); |
509 | } | 509 | } |
510 | #endif | 510 | #endif |
511 | 511 | ||
@@ -519,7 +519,7 @@ void lcd_update_rect(int x, int y, int width, int height) | |||
519 | #else | 519 | #else |
520 | fb_data *src; | 520 | fb_data *src; |
521 | fb_data *dst; | 521 | fb_data *dst; |
522 | src = &lcd_framebuffer[0][0] + (x*LCD_HEIGHT + y); | 522 | src = FBADDR(0,0) + (x*LCD_HEIGHT + y); |
523 | dst = FRAME + (LCD_HEIGHT*(LCD_WIDTH-1) - x * LCD_HEIGHT + y); | 523 | dst = FRAME + (LCD_HEIGHT*(LCD_WIDTH-1) - x * LCD_HEIGHT + y); |
524 | 524 | ||
525 | while(width > 0) { | 525 | while(width > 0) { |
@@ -532,7 +532,7 @@ void lcd_update_rect(int x, int y, int width, int height) | |||
532 | 532 | ||
533 | #else | 533 | #else |
534 | register fb_data *dst, *src; | 534 | register fb_data *dst, *src; |
535 | src = &lcd_framebuffer[y][x]; | 535 | src = FBADDR(x,y); |
536 | 536 | ||
537 | dst=FRAME + (LCD_NATIVE_WIDTH*(LCD_NATIVE_HEIGHT-1)) | 537 | dst=FRAME + (LCD_NATIVE_WIDTH*(LCD_NATIVE_HEIGHT-1)) |
538 | - LCD_NATIVE_WIDTH*x + y ; | 538 | - LCD_NATIVE_WIDTH*x + y ; |
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-mr500.c index d8f55ee63d..5b8b2f9437 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-mr500.c | |||
@@ -246,7 +246,7 @@ static void remote_tick(void) | |||
246 | for(i=7; i<remote_payload_size; i++) | 246 | for(i=7; i<remote_payload_size; i++) |
247 | { | 247 | { |
248 | remote_payload[i]= | 248 | remote_payload[i]= |
249 | lcd_remote_framebuffer[remote_payload[4]>>3][i+remote_draw_x-7]; | 249 | FBREMOTEADDR(i+remote_draw_x-7, remote_payload[4]>>3); |
250 | } | 250 | } |
251 | } | 251 | } |
252 | 252 | ||
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/lcd-sansaconnect.c b/firmware/target/arm/tms320dm320/sansa-connect/lcd-sansaconnect.c index 403ce182be..27eb0b407a 100644 --- a/firmware/target/arm/tms320dm320/sansa-connect/lcd-sansaconnect.c +++ b/firmware/target/arm/tms320dm320/sansa-connect/lcd-sansaconnect.c | |||
@@ -167,7 +167,7 @@ static void dma_lcd_copy_buffer_rect(int x, int y, int width, int height) | |||
167 | 167 | ||
168 | /* Set source and destination addresses */ | 168 | /* Set source and destination addresses */ |
169 | dst = (char*)(FRAME + LCD_WIDTH*y + x); | 169 | dst = (char*)(FRAME + LCD_WIDTH*y + x); |
170 | src = (char*)(&lcd_framebuffer[y][x]); | 170 | src = (char*)(FBADDR(x,y)); |
171 | 171 | ||
172 | /* Flush cache to memory */ | 172 | /* Flush cache to memory */ |
173 | commit_dcache(); | 173 | commit_dcache(); |