From 19b45a4374bb3efda4f554d3d806835368d1536a Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Wed, 8 Mar 2006 01:14:46 +0000 Subject: 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 --- firmware/drivers/lcd-2bit-horz.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'firmware/drivers') 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); } -- cgit v1.2.3