revert r24478 and make the backdrop behaviour the same as it used to be (so when in the wps the sbs' backdrop will be fully disabled). Also changes the API back to having to manually set the current backdrop.

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

1 files changed, 2 insertions, 16 deletions

diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c
index 24c5aa15cb..586c74578f 100644
--- a/firmware/drivers/lcd-bitmap-common.c
+++ b/firmware/drivers/lcd-bitmap-common.c
@@ -39,9 +39,6 @@
 #define MAIN_LCD
 #endif
 
-#define HAS_BACKDROP ((defined(MAIN_LCD) && LCD_DEPTH > 1) \
-                      || (!defined(MAIN_LCD) && LCD_REMOTE_DEPTH > 1))
-
 #if defined(MAIN_LCD) && defined(HAVE_LCD_COLOR)
 /* Fill a rectangle with a gradient */
 static void lcd_gradient_rect(int x1, int x2, int y, unsigned h,
@@ -373,10 +370,7 @@ void LCDFN(puts_scroll_style_offset)(int x, int y, const unsigned char *string,
     s->len = utf8length(string);
     s->offset = offset;
     s->startx = x * LCDFN(getstringsize)(" ", NULL, NULL);
-    s->backward = false;    
-#if HAS_BACKDROP
-    s->backdrop = (char*)LCDFN(get_backdrop());
-#endif
+    s->backward = false;
 
     LCDFN(scroll_info).lines++;
 }
@@ -405,9 +399,6 @@ void LCDFN(scroll_fn)(void)
     int index;
     int xpos, ypos;
     struct viewport* old_vp = current_vp;
-#if HAS_BACKDROP
-    FBFN(data*) old_backdrop = LCDFN(get_backdrop)();
-#endif
 
     for ( index = 0; index < LCDFN(scroll_info).lines; index++ ) {
         s = &LCDFN(scroll_info).scroll[index];
@@ -417,9 +408,7 @@ void LCDFN(scroll_fn)(void)
             continue;
 
         LCDFN(set_viewport)(s->vp);
-#if HAS_BACKDROP
-        LCDFN(set_backdrop)((FBFN(data*))s->backdrop);
-#endif
+
         if (s->backward)
             s->offset -= LCDFN(scroll_info).step;
         else
@@ -453,8 +442,5 @@ void LCDFN(scroll_fn)(void)
         LCDFN(update_viewport_rect)(xpos, ypos, current_vp->width - xpos,
                                     pf->height);
     }
-#if HAS_BACKDROP
-    LCDFN(set_backdrop)(old_backdrop);
-#endif
     LCDFN(set_viewport)(old_vp);
 }