Scroll on main and remote with a single thread. Change the way system messages are defined before running out is an issue (which requires a full update of rockbox on the player).

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

4 files changed, 128 insertions, 44 deletions

diff --git a/firmware/export/kernel.h b/firmware/export/kernel.h
index d5898a97f1..cb850d7af2 100644
--- a/firmware/export/kernel.h
+++ b/firmware/export/kernel.h
@@ -34,21 +34,40 @@
 #define QUEUE_LENGTH 16 /* MUST be a power of 2 */
 #define QUEUE_LENGTH_MASK (QUEUE_LENGTH - 1)
 
-/* System defined message ID's, occupying the top 5 bits of the event ID */
-#define SYS_EVENT                 (long)0x80000000 /* SYS events are negative */
-#define SYS_USB_CONNECTED         ((SYS_EVENT | ((long)1 << 27)))
-#define SYS_USB_CONNECTED_ACK     ((SYS_EVENT | ((long)2 << 27)))
-#define SYS_USB_DISCONNECTED      ((SYS_EVENT | ((long)3 << 27)))
-#define SYS_USB_DISCONNECTED_ACK  ((SYS_EVENT | ((long)4 << 27)))
-#define SYS_TIMEOUT               ((SYS_EVENT | ((long)5 << 27)))
-#define SYS_HOTSWAP_INSERTED      ((SYS_EVENT | ((long)6 << 27)))
-#define SYS_HOTSWAP_EXTRACTED     ((SYS_EVENT | ((long)7 << 27)))
-#define SYS_POWEROFF              ((SYS_EVENT | ((long)8 << 27)))
-#define SYS_FS_CHANGED            ((SYS_EVENT | ((long)9 << 27)))
-#define SYS_CHARGER_CONNECTED     ((SYS_EVENT | ((long)10 << 27)))
-#define SYS_CHARGER_DISCONNECTED  ((SYS_EVENT | ((long)11 << 27)))
-#define SYS_PHONE_PLUGGED         ((SYS_EVENT | ((long)12 << 27)))
-#define SYS_PHONE_UNPLUGGED       ((SYS_EVENT | ((long)13 << 27)))
+/* System defined message ID's - |sign bit = 1|class|id| */
+/* Event class list */
+#define SYS_EVENT_CLS_QUEUE   0
+#define SYS_EVENT_CLS_USB     1
+#define SYS_EVENT_CLS_POWER   2
+#define SYS_EVENT_CLS_FILESYS 3
+#define SYS_EVENT_CLS_PLUG    4
+/* make sure SYS_EVENT_CLS_BITS has enough range */
+
+/* MSb->|S|c...c|i...i| */
+#define SYS_EVENT                 ((long)(~0ul ^ (~0ul >> 1)))
+#define SYS_EVENT_CLS_BITS        (3)
+#define SYS_EVENT_CLS_SHIFT       (sizeof (long)*8-SYS_EVENT_CLS_BITS-1)
+#define SYS_EVENT_CLS_MASK        (((1l << SYS_EVENT_CLS_BITS)-1) << SYS_EVENT_SHIFT)
+#define MAKE_SYS_EVENT(cls, id)   (SYS_EVENT | ((long)(cls) << SYS_EVENT_CLS_SHIFT) | (long)(id))
+/* Macros for extracting codes */
+#define SYS_EVENT_CLS(e)          (((e) & SYS_EVENT_CLS_MASK) >> SYS_EVENT_SHIFT)
+#define SYS_EVENT_ID(e)           ((e) & ~(SYS_EVENT|SYS_EVENT_CLS_MASK))
+
+#define SYS_TIMEOUT               MAKE_SYS_EVENT(SYS_EVENT_CLS_QUEUE, 0)
+#define SYS_USB_CONNECTED         MAKE_SYS_EVENT(SYS_EVENT_CLS_USB, 0)
+#define SYS_USB_CONNECTED_ACK     MAKE_SYS_EVENT(SYS_EVENT_CLS_USB, 1)
+#define SYS_USB_DISCONNECTED      MAKE_SYS_EVENT(SYS_EVENT_CLS_USB, 2)
+#define SYS_USB_DISCONNECTED_ACK  MAKE_SYS_EVENT(SYS_EVENT_CLS_USB, 3)
+#define SYS_POWEROFF              MAKE_SYS_EVENT(SYS_EVENT_CLS_POWER, 0)
+#define SYS_CHARGER_CONNECTED     MAKE_SYS_EVENT(SYS_EVENT_CLS_POWER, 1)
+#define SYS_CHARGER_DISCONNECTED  MAKE_SYS_EVENT(SYS_EVENT_CLS_POWER, 2)
+#define SYS_FS_CHANGED            MAKE_SYS_EVENT(SYS_EVENT_CLS_FILESYS, 0)
+#define SYS_HOTSWAP_INSERTED      MAKE_SYS_EVENT(SYS_EVENT_CLS_PLUG, 0)
+#define SYS_HOTSWAP_EXTRACTED     MAKE_SYS_EVENT(SYS_EVENT_CLS_PLUG, 1)
+#define SYS_PHONE_PLUGGED         MAKE_SYS_EVENT(SYS_EVENT_CLS_PLUG, 2)
+#define SYS_PHONE_UNPLUGGED       MAKE_SYS_EVENT(SYS_EVENT_CLS_PLUG, 3)
+#define SYS_REMOTE_PLUGGED        MAKE_SYS_EVENT(SYS_EVENT_CLS_PLUG, 4)
+#define SYS_REMOTE_UNPLUGGED      MAKE_SYS_EVENT(SYS_EVENT_CLS_PLUG, 5)
 
 struct event
 {
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h
index cfb643ff96..329edd5f27 100644
--- a/firmware/export/lcd-remote.h
+++ b/firmware/export/lcd-remote.h
@@ -39,10 +39,6 @@
 int remote_type(void);
 #endif
 
-#ifndef SIMULATOR
-extern struct event_queue remote_scroll_queue;
-#endif
-
 #define STYLE_DEFAULT    0x00000000
 #define STYLE_INVERT     0x20000000
 
@@ -146,6 +142,7 @@ extern void lcd_remote_setmargins(int xmargin, int ymargin);
 extern int  lcd_remote_getxmargin(void);
 extern int  lcd_remote_getymargin(void);
 extern void lcd_remote_setfont(int font);
+extern int  lcd_remote_getfont(void);
 extern int  lcd_remote_getstringsize(const unsigned char *str, int *w, int *h);
 
 /* low level drawing function pointer arrays */
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 8f01ef5cab..608f9ffa0f 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -312,6 +312,7 @@ extern void lcd_set_flip(bool yesno);
 extern void lcd_set_drawmode(int mode);
 extern int  lcd_get_drawmode(void);
 extern void lcd_setfont(int font);
+extern int lcd_getfont(void);
 
 extern void lcd_puts_style_offset(int x, int y, const unsigned char *str,
                                   int style, int offset);
@@ -376,29 +377,4 @@ extern void lcd_bitmap_transparent(const fb_data *src, int x, int y,
 
 #endif /* HAVE_LCD_BITMAP */
 
-/* internal usage, but in multiple drivers */
-#define SCROLL_SPACING   3
-#ifdef HAVE_LCD_BITMAP
-#define SCROLL_LINE_SIZE (MAX_PATH + SCROLL_SPACING + 3*LCD_WIDTH/2 + 2)
-#else
-#define SCROLL_LINE_SIZE (MAX_PATH + SCROLL_SPACING + 3*LCD_WIDTH + 2)
-#endif
-
-struct scrollinfo {
-    char line[SCROLL_LINE_SIZE];
-    int len;    /* length of line in chars */
-    int offset;
-    int startx;
-#ifdef HAVE_LCD_BITMAP
-    int width;  /* length of line in pixels */
-    bool invert; /* invert the scrolled text */
-#endif
-    bool backward; /* scroll presently forward or backward? */
-    bool bidir;
-    long start_tick;
-#ifdef HAVE_LCD_COLOR
-    int line_colour;
-#endif
-};
-
 #endif /* __LCD_H__ */
diff --git a/firmware/export/scroll_engine.h b/firmware/export/scroll_engine.h
new file mode 100644
index 0000000000..aa11a9ba1f
--- /dev/null
+++ b/firmware/export/scroll_engine.h
@@ -0,0 +1,92 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2007 Michael Sevakis
+ *
+ * LCD scrolling driver and scheduler
+ *
+ * Much collected and combined from the various Rockbox LCD drivers.
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#ifndef __SCROLL_ENGINE_H__
+#define __SCROLL_ENGINE_H__
+
+void scroll_init(void);
+void lcd_scroll_fn(void);
+void lcd_remote_scroll_fn(void);
+
+/* internal usage, but in multiple drivers */
+#define SCROLL_SPACING   3
+#ifdef HAVE_LCD_BITMAP
+#define SCROLL_LINE_SIZE (MAX_PATH + SCROLL_SPACING + 3*LCD_WIDTH/2 + 2)
+#else
+#define SCROLL_LINE_SIZE (MAX_PATH + SCROLL_SPACING + 3*LCD_WIDTH + 2)
+#endif
+
+struct scrollinfo
+{
+    char line[SCROLL_LINE_SIZE];
+    int len;    /* length of line in chars */
+    int offset;
+    int startx;
+#ifdef HAVE_LCD_BITMAP
+    int width;  /* length of line in pixels */
+    bool invert; /* invert the scrolled text */
+#endif
+    bool backward; /* scroll presently forward or backward? */
+    bool bidir;
+    long start_tick;
+#ifdef HAVE_LCD_COLOR
+    int line_color;
+#endif
+};
+
+struct scroll_screen_info
+{
+    struct scrollinfo * const scroll;
+    const int num_scroll; /* number of scrollable lines (also number of scroll structs) */
+    int lines;  /* Bitpattern of which lines are scrolling */
+    long ticks; /* # of ticks between updates*/
+    long delay; /* ticks delay before start */
+    int bidir_limit;  /* percent */
+#ifdef HAVE_LCD_CHARCELLS
+    long jump_scroll_delay; /* delay between jump scroll jumps */
+    int jump_scroll; /* 0=off, 1=once, ..., JUMP_SCROLL_ALWAYS */
+#endif
+#if defined(HAVE_LCD_BITMAP) || defined(HAVE_REMOTE_LCD)
+    int step;  /* pixels per scroll step */
+#endif
+#if defined(HAVE_REMOTE_LCD)
+    long last_scroll;
+#endif
+};
+
+/** main lcd **/
+#ifdef HAVE_LCD_BITMAP
+#define LCD_SCROLLABLE_LINES ((LCD_HEIGHT+4)/5 < 32 ? (LCD_HEIGHT+4)/5 : 32)
+#else
+#define LCD_SCROLLABLE_LINES LCD_HEIGHT
+#endif
+
+extern struct scroll_screen_info lcd_scroll_info;
+
+/** remote lcd **/
+#ifdef HAVE_REMOTE_LCD
+#define LCD_REMOTE_SCROLLABLE_LINES \
+    (((LCD_REMOTE_HEIGHT+4)/5 < 32) ? (LCD_REMOTE_HEIGHT+4)/5 : 32)
+extern struct scroll_screen_info lcd_remote_scroll_info;
+#endif
+
+#endif /* __SCROLL_ENGINE_H__ */