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)
 
     lcd_write_cmd(R_WRITE_DATA_2_GRAM);
 
-    dbop_write_data((fb_data*)lcd_framebuffer, LCD_WIDTH*LCD_HEIGHT);
+    dbop_write_data(FBADDR(0,0), LCD_WIDTH*LCD_HEIGHT);
 }
 
 /* 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)
     unsigned int addr;
     direct_fb_access = yes;
     if(yes)
-        addr = ((unsigned int)&lcd_framebuffer-CONFIG_SDRAM_START) / 32;
+        addr = ((unsigned int)FBADDR(0,0)-CONFIG_SDRAM_START) / 32;
     else
         addr = ((unsigned int)FRAME-CONFIG_SDRAM_START) / 32;
     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)
 #if CONFIG_ORIENTATION == SCREEN_PORTRAIT
 
 #if defined(LCD_USE_DMA)
-    dma_start_transfer16( (char *)lcd_framebuffer, x, y, LCD_WIDTH, 
+    dma_start_transfer16( (char *)FBADDR(0,0), x, y, LCD_WIDTH, 
         x, y, width, height, 2);
 #else
     register fb_data *dst;
@@ -514,7 +514,7 @@ void lcd_update_rect(int x, int y, int width, int height)
 #if   defined(LCD_STRIDEFORMAT) && LCD_STRIDEFORMAT == VERTICAL_STRIDE
 
 #if defined(LCD_USE_DMA)
-    dma_start_transfer16( (char *)lcd_framebuffer, x, y, LCD_HEIGHT, 
+    dma_start_transfer16( (char *)FBADDR(0,0), x, y, LCD_HEIGHT, 
         x, y, width, height, 2);
 #else
     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)
         lcd_begin_write_gram();
 
         dma_count = 1;
-        SAR3 = (unsigned long)lcd_framebuffer;
+        SAR3 = (unsigned long)FBADDR(0,0);
         BCR3 = LCD_WIDTH*LCD_HEIGHT*sizeof(fb_data);
         DCR3 = DMA_INT | DMA_AA | DMA_BWC(1)
              | 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)
     dma_len = LCD_WIDTH*2;
 
     /* Initialize DMA transfer */
-    SAR3 = (unsigned long)lcd_framebuffer;
+    SAR3 = (unsigned long)FBADDR(0,0);
     BCR3 = LCD_WIDTH*2;
     DCR3 = DMA_INT | DMA_AA | DMA_BWC(1)
          | 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)
     if (display_on)
     {
         JNIEnv e = *env_ptr;
-        jobject buffer = e->NewDirectByteBuffer(env_ptr, lcd_framebuffer,
+        jobject buffer = e->NewDirectByteBuffer(env_ptr, FBADDR(0,0),
                                                (jlong) FRAMEBUFFER_SIZE);
 
         e->CallVoidMethod(env_ptr, RockboxFramebuffer_instance,
@@ -97,7 +97,7 @@ void lcd_update_rect(int x, int y, int width, int height)
     if (display_on)
     {
         JNIEnv e = *env_ptr;
-        jobject buffer = e->NewDirectByteBuffer(env_ptr, lcd_framebuffer,
+        jobject buffer = e->NewDirectByteBuffer(env_ptr, FBADDR(0,0),
                                                    (jlong) FRAMEBUFFER_SIZE);
         jobject rect = e->NewObject(env_ptr, AndroidRect_class, AndroidRect_constructor,
                                         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,
     (void)max_y;
     (void)getpixel;
     /* Update complete screen via one blit operation (fast) */
-    SDL_Surface *lcd = SDL_CreateRGBSurfaceFrom(lcd_framebuffer, LCD_FBWIDTH,
+    SDL_Surface *lcd = SDL_CreateRGBSurfaceFrom(FBADDR(0, 0), LCD_FBWIDTH,
                                                 LCD_FBHEIGHT, LCD_DEPTH,
                                                 LCD_FBWIDTH * LCD_DEPTH/8,
                                                 0, 0, 0, 0);