diff options
Diffstat (limited to 'firmware/target')
-rw-r--r-- | firmware/target/arm/as3525/lcd-fuze.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c | 4 | ||||
-rw-r--r-- | firmware/target/coldfire/iriver/h300/lcd-h300.c | 2 | ||||
-rw-r--r-- | firmware/target/coldfire/mpio/hd200/lcd-hd200.c | 2 | ||||
-rw-r--r-- | firmware/target/hosted/android/lcd-android.c | 4 | ||||
-rw-r--r-- | firmware/target/hosted/sdl/lcd-sdl.c | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/firmware/target/arm/as3525/lcd-fuze.c b/firmware/target/arm/as3525/lcd-fuze.c index df4d668ab0..a1ccea348d 100644 --- a/firmware/target/arm/as3525/lcd-fuze.c +++ b/firmware/target/arm/as3525/lcd-fuze.c | |||
@@ -291,7 +291,7 @@ void lcd_update(void) | |||
291 | 291 | ||
292 | lcd_write_cmd(R_WRITE_DATA_2_GRAM); | 292 | lcd_write_cmd(R_WRITE_DATA_2_GRAM); |
293 | 293 | ||
294 | dbop_write_data((fb_data*)lcd_framebuffer, LCD_WIDTH*LCD_HEIGHT); | 294 | dbop_write_data(FBADDR(0,0), LCD_WIDTH*LCD_HEIGHT); |
295 | } | 295 | } |
296 | 296 | ||
297 | /* Update a fraction of the display. */ | 297 | /* Update a fraction of the display. */ |
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c b/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c index 5f623dc239..9621b532fe 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c +++ b/firmware/target/arm/tms320dm320/creative-zvm/lcd-creativezvm.c | |||
@@ -251,7 +251,7 @@ void lcd_set_direct_fb(bool yes) | |||
251 | unsigned int addr; | 251 | unsigned int addr; |
252 | direct_fb_access = yes; | 252 | direct_fb_access = yes; |
253 | if(yes) | 253 | if(yes) |
254 | addr = ((unsigned int)&lcd_framebuffer-CONFIG_SDRAM_START) / 32; | 254 | addr = ((unsigned int)FBADDR(0,0)-CONFIG_SDRAM_START) / 32; |
255 | else | 255 | else |
256 | addr = ((unsigned int)FRAME-CONFIG_SDRAM_START) / 32; | 256 | addr = ((unsigned int)FRAME-CONFIG_SDRAM_START) / 32; |
257 | IO_OSD_OSDWINADH = addr >> 16; | 257 | IO_OSD_OSDWINADH = addr >> 16; |
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c index c3a96a3efd..d952d3d40d 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c | |||
@@ -489,7 +489,7 @@ void lcd_update_rect(int x, int y, int width, int height) | |||
489 | #if CONFIG_ORIENTATION == SCREEN_PORTRAIT | 489 | #if CONFIG_ORIENTATION == SCREEN_PORTRAIT |
490 | 490 | ||
491 | #if defined(LCD_USE_DMA) | 491 | #if defined(LCD_USE_DMA) |
492 | dma_start_transfer16( (char *)lcd_framebuffer, x, y, LCD_WIDTH, | 492 | dma_start_transfer16( (char *)FBADDR(0,0), x, y, LCD_WIDTH, |
493 | x, y, width, height, 2); | 493 | x, y, width, height, 2); |
494 | #else | 494 | #else |
495 | register fb_data *dst; | 495 | register fb_data *dst; |
@@ -514,7 +514,7 @@ void lcd_update_rect(int x, int y, int width, int height) | |||
514 | #if defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE | 514 | #if defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE |
515 | 515 | ||
516 | #if defined(LCD_USE_DMA) | 516 | #if defined(LCD_USE_DMA) |
517 | dma_start_transfer16( (char *)lcd_framebuffer, x, y, LCD_HEIGHT, | 517 | dma_start_transfer16( (char *)FBADDR(0,0), x, y, LCD_HEIGHT, |
518 | x, y, width, height, 2); | 518 | x, y, width, height, 2); |
519 | #else | 519 | #else |
520 | fb_data *src; | 520 | fb_data *src; |
diff --git a/firmware/target/coldfire/iriver/h300/lcd-h300.c b/firmware/target/coldfire/iriver/h300/lcd-h300.c index 191c769c97..312bd70ccc 100644 --- a/firmware/target/coldfire/iriver/h300/lcd-h300.c +++ b/firmware/target/coldfire/iriver/h300/lcd-h300.c | |||
@@ -408,7 +408,7 @@ void lcd_update(void) | |||
408 | lcd_begin_write_gram(); | 408 | lcd_begin_write_gram(); |
409 | 409 | ||
410 | dma_count = 1; | 410 | dma_count = 1; |
411 | SAR3 = (unsigned long)lcd_framebuffer; | 411 | SAR3 = (unsigned long)FBADDR(0,0); |
412 | BCR3 = LCD_WIDTH*LCD_HEIGHT*sizeof(fb_data); | 412 | BCR3 = LCD_WIDTH*LCD_HEIGHT*sizeof(fb_data); |
413 | DCR3 = DMA_INT | DMA_AA | DMA_BWC(1) | 413 | DCR3 = DMA_INT | DMA_AA | DMA_BWC(1) |
414 | | DMA_SINC | DMA_SSIZE(DMA_SIZE_LINE) | 414 | | DMA_SINC | DMA_SSIZE(DMA_SIZE_LINE) |
diff --git a/firmware/target/coldfire/mpio/hd200/lcd-hd200.c b/firmware/target/coldfire/mpio/hd200/lcd-hd200.c index 3c00959745..967618fce1 100644 --- a/firmware/target/coldfire/mpio/hd200/lcd-hd200.c +++ b/firmware/target/coldfire/mpio/hd200/lcd-hd200.c | |||
@@ -218,7 +218,7 @@ void lcd_update(void) | |||
218 | dma_len = LCD_WIDTH*2; | 218 | dma_len = LCD_WIDTH*2; |
219 | 219 | ||
220 | /* Initialize DMA transfer */ | 220 | /* Initialize DMA transfer */ |
221 | SAR3 = (unsigned long)lcd_framebuffer; | 221 | SAR3 = (unsigned long)FBADDR(0,0); |
222 | BCR3 = LCD_WIDTH*2; | 222 | BCR3 = LCD_WIDTH*2; |
223 | DCR3 = DMA_INT | DMA_AA | DMA_BWC(1) | 223 | DCR3 = DMA_INT | DMA_AA | DMA_BWC(1) |
224 | | DMA_SINC | DMA_SSIZE(DMA_SIZE_LINE) | 224 | | DMA_SINC | DMA_SSIZE(DMA_SIZE_LINE) |
diff --git a/firmware/target/hosted/android/lcd-android.c b/firmware/target/hosted/android/lcd-android.c index a161406cc0..12df52c95e 100644 --- a/firmware/target/hosted/android/lcd-android.c +++ b/firmware/target/hosted/android/lcd-android.c | |||
@@ -83,7 +83,7 @@ void lcd_update(void) | |||
83 | if (display_on) | 83 | if (display_on) |
84 | { | 84 | { |
85 | JNIEnv e = *env_ptr; | 85 | JNIEnv e = *env_ptr; |
86 | jobject buffer = e->NewDirectByteBuffer(env_ptr, lcd_framebuffer, | 86 | jobject buffer = e->NewDirectByteBuffer(env_ptr, FBADDR(0,0), |
87 | (jlong) FRAMEBUFFER_SIZE); | 87 | (jlong) FRAMEBUFFER_SIZE); |
88 | 88 | ||
89 | e->CallVoidMethod(env_ptr, RockboxFramebuffer_instance, | 89 | e->CallVoidMethod(env_ptr, RockboxFramebuffer_instance, |
@@ -97,7 +97,7 @@ void lcd_update_rect(int x, int y, int width, int height) | |||
97 | if (display_on) | 97 | if (display_on) |
98 | { | 98 | { |
99 | JNIEnv e = *env_ptr; | 99 | JNIEnv e = *env_ptr; |
100 | jobject buffer = e->NewDirectByteBuffer(env_ptr, lcd_framebuffer, | 100 | jobject buffer = e->NewDirectByteBuffer(env_ptr, FBADDR(0,0), |
101 | (jlong) FRAMEBUFFER_SIZE); | 101 | (jlong) FRAMEBUFFER_SIZE); |
102 | jobject rect = e->NewObject(env_ptr, AndroidRect_class, AndroidRect_constructor, | 102 | jobject rect = e->NewObject(env_ptr, AndroidRect_class, AndroidRect_constructor, |
103 | x, y, x + width, y + height); | 103 | x, y, x + width, y + height); |
diff --git a/firmware/target/hosted/sdl/lcd-sdl.c b/firmware/target/hosted/sdl/lcd-sdl.c index 40ba94072b..de19de365a 100644 --- a/firmware/target/hosted/sdl/lcd-sdl.c +++ b/firmware/target/hosted/sdl/lcd-sdl.c | |||
@@ -39,7 +39,7 @@ void sdl_update_rect(SDL_Surface *surface, int x_start, int y_start, int width, | |||
39 | (void)max_y; | 39 | (void)max_y; |
40 | (void)getpixel; | 40 | (void)getpixel; |
41 | /* Update complete screen via one blit operation (fast) */ | 41 | /* Update complete screen via one blit operation (fast) */ |
42 | SDL_Surface *lcd = SDL_CreateRGBSurfaceFrom(lcd_framebuffer, LCD_FBWIDTH, | 42 | SDL_Surface *lcd = SDL_CreateRGBSurfaceFrom(FBADDR(0, 0), LCD_FBWIDTH, |
43 | LCD_FBHEIGHT, LCD_DEPTH, | 43 | LCD_FBHEIGHT, LCD_DEPTH, |
44 | LCD_FBWIDTH * LCD_DEPTH/8, | 44 | LCD_FBWIDTH * LCD_DEPTH/8, |
45 | 0, 0, 0, 0); | 45 | 0, 0, 0, 0); |