summaryrefslogtreecommitdiff
path: root/firmware/export
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2006-03-08 01:14:46 +0000
committerJens Arnold <amiconn@rockbox.org>2006-03-08 01:14:46 +0000
commit19b45a4374bb3efda4f554d3d806835368d1536a (patch)
tree1fac6f5b900e7e40d9f770d14c5701db6231ec0f /firmware/export
parent761652abf71dcae63769a67388575fa47b6e8567 (diff)
downloadrockbox-19b45a4374bb3efda4f554d3d806835368d1536a.zip
rockbox-19b45a4374bb3efda4f554d3d806835368d1536a.tar.gz
rockbox-19b45a4374bb3efda4f554d3d806835368d1536a.tar.bz2
rockbox-19b45a4374bb3efda4f554d3d806835368d1536a.tar.xz
LCD extension library: Implemented scrolling for LCD depths below 8 bit. * Oscilloscope: Use new scrolling function, some minor optimisations.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8951 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r--firmware/export/lcd.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 6f7fef9..89bf353 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)