2 files changed, 15 insertions, 11 deletions

diff --git a/firmware/drivers/lcd-2bit-horz.c b/firmware/drivers/lcd-2bit-horz.c
index 164e94cb73..a76ebe1f0d 100644
--- a/firmware/drivers/lcd-2bit-horz.c
+++ b/firmware/drivers/lcd-2bit-horz.c
@@ -38,7 +38,7 @@
 
 /*** globals ***/
 
-unsigned char lcd_framebuffer[LCD_HEIGHT][FB_WIDTH] IBSS_ATTR;
+unsigned char lcd_framebuffer[LCD_HEIGHT][LCD_FBWIDTH] IBSS_ATTR;
 
 static const unsigned char dibits[16] ICONST_ATTR = {
     0x00, 0x03, 0x0C, 0x0F, 0x30, 0x33, 0x3C, 0x3F,
@@ -419,11 +419,11 @@ void lcd_vline(int x, int y1, int y2)
     dst   = &lcd_framebuffer[y1][x>>2];
     mask  = pixmask[x & 3];
     
-    dst_end = dst + (y2 - y1) * FB_WIDTH;
+    dst_end = dst + (y2 - y1) * LCD_FBWIDTH;
     do
     {
         bfunc(dst, mask, 0xFFu);
-        dst += FB_WIDTH;
+        dst += LCD_FBWIDTH;
     }
     while (dst <= dst_end);
 }
@@ -482,11 +482,11 @@ void lcd_fillrect(int x, int y, int width, int height)
     {
         unsigned char *dst_col = dst;
 
-        dst_end = dst_col + height * FB_WIDTH;
+        dst_end = dst_col + height * LCD_FBWIDTH;
         do
         {
             bfunc(dst_col, mask, 0xFFu);
-            dst_col += FB_WIDTH;
+            dst_col += LCD_FBWIDTH;
         }
         while (dst_col < dst_end);
 
@@ -495,11 +495,11 @@ void lcd_fillrect(int x, int y, int width, int height)
     }
     mask &= mask_right;
 
-    dst_end = dst + height * FB_WIDTH;
+    dst_end = dst + height * LCD_FBWIDTH;
     do
     {
         bfunc(dst, mask, 0xFFu);
-        dst += FB_WIDTH;
+        dst += LCD_FBWIDTH;
     }
     while (dst < dst_end);
 }
@@ -651,7 +651,7 @@ void lcd_bitmap_part(const unsigned char *src, int src_x, int src_y,
     mask_right = 0xFFu >> (2 * (~nx & 3));
     
     shift *= 2;
-    dst_end = dst + height * FB_WIDTH;
+    dst_end = dst + height * LCD_FBWIDTH;
     do
     {
         const unsigned char *src_row = src;
@@ -678,7 +678,7 @@ void lcd_bitmap_part(const unsigned char *src, int src_x, int src_y,
         setblock(dst_row, mask_row & mask_right, data);
 
         src += stride;
-        dst += FB_WIDTH;
+        dst += LCD_FBWIDTH;
     }
     while (dst < dst_end);
 }
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 6f7fef94ee..89bf35300c 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -205,8 +205,8 @@ typedef void lcd_fastpixelfunc_type(fb_data *address);
 extern fb_data lcd_framebuffer[LCD_HEIGHT/8][LCD_WIDTH];
 #elif LCD_DEPTH == 2
 #if LCD_PIXELFORMAT == HORIZONTAL_PACKING
-#define FB_WIDTH ((LCD_WIDTH+3)/4)
-extern fb_data lcd_framebuffer[LCD_HEIGHT][FB_WIDTH];
+#define LCD_FBWIDTH ((LCD_WIDTH+3)/4)
+extern fb_data lcd_framebuffer[LCD_HEIGHT][LCD_FBWIDTH];
 #else
 extern fb_data lcd_framebuffer[LCD_HEIGHT/4][LCD_WIDTH];
 #endif
@@ -214,6 +214,10 @@ extern fb_data lcd_framebuffer[LCD_HEIGHT/4][LCD_WIDTH];
 extern fb_data lcd_framebuffer[LCD_HEIGHT][LCD_WIDTH];
 #elif LCD_DEPTH == 18
 extern fb_data lcd_framebuffer[LCD_HEIGHT][LCD_WIDTH];
+#endif       
+
+#ifndef LCD_FBWIDTH
+#define LCD_FBWIDTH LCD_WIDTH
 #endif
 
 #if (CONFIG_BACKLIGHT==BL_IRIVER_H300) || (CONFIG_BACKLIGHT==BL_IPOD3G)