Horizontal screen scrolling part 3 (by Shachar Liberman)

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

1 files changed, 8 insertions, 13 deletions

diff --git a/apps/screen_access.c b/apps/screen_access.c
index b47bd10122..dfe2b13a46 100644
--- a/apps/screen_access.c
+++ b/apps/screen_access.c
@@ -67,15 +67,13 @@ void screen_init(struct screen * screen, enum screen_type screen_type)
             screen->scroll_delay=&lcd_remote_scroll_delay;
             screen->scroll_step=&lcd_remote_scroll_step;
             screen->invertscroll=&lcd_remote_invertscroll;
-
-            screen->puts_scroll_style=&lcd_remote_puts_scroll_style;          
-            screen->puts_scroll_offset=&lcd_remote_puts_scroll_offset;
-            screen->puts_scroll_style_offset=&lcd_remote_puts_scroll_style_offset;
-            
+#endif /* LCD_REMOTE_DEPTH > 1 */
             screen->puts_offset=&lcd_remote_puts_offset;
-            screen->puts_style=&lcd_remote_puts_style;
             screen->puts_style_offset=&lcd_remote_puts_style_offset;
-#endif /* LCD_REMOTE_DEPTH > 1 */
+            screen->puts_scroll_style=&lcd_remote_puts_scroll_style;
+            screen->puts_scroll_offset=&lcd_remote_puts_scroll_offset;
+            screen->puts_scroll_style_offset=&lcd_remote_puts_scroll_style_offset;
+
 #if 0 /* no charcell remote LCDs so far */
             screen->width=11;
             screen->height=2;
@@ -99,7 +97,6 @@ void screen_init(struct screen * screen, enum screen_type screen_type)
             screen->backlight_on=&remote_backlight_on;
             screen->backlight_off=&remote_backlight_off;
             break;
-            
 #endif /* HAVE_REMOTE_LCD */
 
         case SCREEN_MAIN:
@@ -136,13 +133,11 @@ void screen_init(struct screen * screen, enum screen_type screen_type)
             screen->scroll_delay=&lcd_scroll_delay;
             screen->scroll_step=&lcd_scroll_step;
             screen->invertscroll=&lcd_invertscroll;
-
-            screen->puts_scroll_offset=&lcd_puts_scroll_offset;
-            screen->puts_scroll_style_offset=&lcd_puts_scroll_style_offset;
-            
             screen->puts_offset=&lcd_puts_offset;
             screen->puts_style_offset=&lcd_puts_style_offset;
-            screen->puts_style=&lcd_puts_style;
+            screen->puts_scroll_style=&lcd_puts_scroll_offset;
+            screen->puts_scroll_offset=&lcd_puts_scroll_style;
+            screen->puts_scroll_style_offset=&lcd_puts_scroll_style_offset;
 #endif /* HAVE_LCD_BITMAP */
 
 #ifdef HAVE_LCD_CHARCELLS