Add viewport capabilities to all the LCD drivers, and adapt scrolling code. This is the firmware/ part of FS#8385 - the changes to the WPS code still need more work and will be committed at a later date. NOTE: There are no user-visible changes with this commit - just the infrastructure.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16018 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 3 insertions, 4 deletions

diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c
index 91b2eae986..9b066d61d0 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c
@@ -11,10 +11,9 @@ static volatile bool lcd_on = true;
 volatile bool lcd_poweroff = false;
 static unsigned lcd_yuv_options = 0;
 /*
-** These are imported from lcd-16bit.c
+** This is imported from lcd-16bit.c
 */
-extern unsigned fg_pattern;
-extern unsigned bg_pattern;
+extern struct viewport* current_vp;
 
 /* Copies a rectangle from one framebuffer to another. Can be used in
    single transfer mode with width = num pixels, and height = 1 which
@@ -245,7 +244,7 @@ void lcd_bitmap_transparent_part(const fb_data *src, int src_x, int src_y,
           [dstp]"r"(LCD_WIDTH - width),
           [transcolor]"r"(TRANSPARENT_COLOR),
           [fgcolor]"r"(REPLACEWITHFG_COLOR),
-          [fgpat]"r"(fg_pattern)
+          [fgpat]"r"(current_vp->fg_pattern)
     );
 }