Move screendump from apps to firmware, solving two nasty firmware-to-apps calls. This required to move the filename creation functions as well. * Fix bug in the BMP header of Clip screendumps. * Add remote screendump for targets with an LCD remote. * Simplify some ifdefs and rename a macro in the sim.

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

5 files changed, 165 insertions, 13 deletions

diff --git a/firmware/SOURCES b/firmware/SOURCES
index a9a0b17632..4d33c7949b 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -2,6 +2,7 @@ ata_idle_notify.c
 events.c
 backlight.c
 buffer.c
+general.c
 powermgmt.c
 system.c
 usb.c
@@ -73,6 +74,9 @@ font_cache.c
 font.c
 hangul.c
 lru.c
+#ifndef BOOTLOADER
+screendump.c
+#endif
 #if LCD_DEPTH == 1
 drivers/lcd-1bit-vert.c
 #elif LCD_DEPTH == 2
@@ -201,7 +205,6 @@ sound.c
 #if CONFIG_CODEC == SWCODEC
 
 #ifndef BOOTLOADER
-general.c
 pcm_sampr.c
 pcm.c
 #ifdef HAVE_RECORDING
diff --git a/firmware/backlight.c b/firmware/backlight.c
index 9c153e885a..513f643171 100644
--- a/firmware/backlight.c
+++ b/firmware/backlight.c
@@ -35,6 +35,7 @@
 #include "timer.h"
 #include "backlight.h"
 #include "lcd.h"
+#include "screendump.h"
 
 #ifdef HAVE_REMOTE_LCD
 #include "lcd-remote.h"
@@ -57,9 +58,6 @@ int backlight_brightness = DEFAULT_BRIGHTNESS_SETTING;
 #include "backlight-sw-fading.h"
 #endif
 #ifdef SIMULATOR
-/* TODO: find a better way to do it but we need a kernel thread somewhere to
-   handle this */
-extern void screen_dump(void);
 
 static inline void _backlight_on(void)
 {
@@ -600,9 +598,13 @@ void backlight_thread(void)
 #endif /* HAVE_REMOTE_LCD/ HAVE_REMOTE_LCD_AS_MAIN */
 #endif /* !SIMULATOR */
 #ifdef SIMULATOR
-            /* This one here too for lack of a better place */
+            /* TODO: find a better way to do it but we need
+             * a kernel thread somewhere to handle this */
             case SYS_SCREENDUMP:
                 screen_dump();
+#ifdef HAVE_REMOTE_LCD
+                remote_screen_dump();
+#endif
                 break;
 #endif
             case SYS_USB_CONNECTED:
diff --git a/firmware/export/general.h b/firmware/export/general.h
index d1bd14558c..8da4a0ad59 100644
--- a/firmware/export/general.h
+++ b/firmware/export/general.h
@@ -24,7 +24,9 @@
 
 #include <stdbool.h>
 #include <stddef.h>
+#include "config.h"
 
+#if CONFIG_CODEC == SWCODEC
 /* round a signed/unsigned 32bit value to the closest of a list of values */
 /* returns the index of the closest value */
 int round_value_to_list32(unsigned long value,
@@ -36,5 +38,38 @@ int make_list_from_caps32(unsigned long src_mask,
                           const unsigned long *src_list,
                           unsigned long caps_mask,
                           unsigned long *caps_list);
+#endif /* CONFIG_CODEC == SWCODEC */
+
+/* Create a filename with a number part in a way that the number is 1
+ * higher than the highest numbered file matching the same pattern.
+ * It is allowed that buffer and path point to the same memory location,
+ * saving a strcpy(). Path must always be given without trailing slash.
+ *
+ * "num" can point to an int specifying the number to use or NULL or a value
+ * less than zero to number automatically. The final number used will also
+ * be returned in *num. If *num is >= 0 then *num will be incremented by
+ * one. */
+#if defined(HAVE_RECORDING) && (CONFIG_RTC == 0)
+/* this feature is needed by recording without a RTC to prevent disk access
+   when changing files */
+#define IF_CNFN_NUM_(...) __VA_ARGS__
+#define IF_CNFN_NUM
+#else
+#define IF_CNFN_NUM_(...)
+#endif
+char *create_numbered_filename(char *buffer, const char *path,
+                               const char *prefix, const char *suffix,
+                               int numberlen IF_CNFN_NUM_(, int *num));
+
+#if CONFIG_RTC
+/* Create a filename with a date+time part.
+   It is allowed that buffer and path point to the same memory location,
+   saving a strcpy(). Path must always be given without trailing slash.
+   unique_time as true makes the function wait until the current time has
+   changed. */
+char *create_datetime_filename(char *buffer, const char *path,
+                               const char *prefix, const char *suffix,
+                               bool unique_time);
+#endif /* CONFIG_RTC */
 
 #endif /* GENERAL_H */
diff --git a/firmware/general.c b/firmware/general.c
index ff6594086e..1ff3340d27 100644
--- a/firmware/general.c
+++ b/firmware/general.c
@@ -18,11 +18,20 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
-#include <limits.h>
-#include "system.h"
+
 #include "config.h"
 #include "general.h"
 
+#include "dir.h"
+#include "limits.h"
+#include "sprintf.h"
+#include "stdlib.h"
+#include "string.h"
+#include "system.h"
+#include "time.h"
+#include "timefuncs.h"
+
+#if CONFIG_CODEC == SWCODEC
 int round_value_to_list32(unsigned long value,
                           const unsigned long list[],
                           int count,
@@ -78,3 +87,107 @@ int make_list_from_caps32(unsigned long src_mask,
 
     return count;
 } /* make_list_from_caps32 */
+#endif /* CONFIG_CODEC == SWCODEC */
+
+/* Create a filename with a number part in a way that the number is 1
+ * higher than the highest numbered file matching the same pattern.
+ * It is allowed that buffer and path point to the same memory location,
+ * saving a strcpy(). Path must always be given without trailing slash.
+ * "num" can point to an int specifying the number to use or NULL or a value
+ * less than zero to number automatically. The final number used will also
+ * be returned in *num. If *num is >= 0 then *num will be incremented by
+ * one. */
+char *create_numbered_filename(char *buffer, const char *path,
+                               const char *prefix, const char *suffix,
+                               int numberlen IF_CNFN_NUM_(, int *num))
+{
+    DIR *dir;
+    struct dirent *entry;
+    int max_num;
+    int pathlen;
+    int prefixlen = strlen(prefix);
+    char fmtstring[12];
+
+    if (buffer != path)
+        strncpy(buffer, path, MAX_PATH);
+
+    pathlen = strlen(buffer);
+
+#ifdef IF_CNFN_NUM
+    if (num && *num >= 0)
+    {
+        /* number specified */
+        max_num = *num;
+    }
+    else
+#endif
+    {
+        /* automatic numbering */
+        max_num = 0;
+
+    dir = opendir(pathlen ? buffer : "/");
+    if (!dir)
+        return NULL;
+
+    while ((entry = readdir(dir)))
+    {
+        int curr_num;
+
+        if (strncasecmp((char *)entry->d_name, prefix, prefixlen)
+            || strcasecmp((char *)entry->d_name + prefixlen + numberlen, suffix))
+            continue;
+
+        curr_num = atoi((char *)entry->d_name + prefixlen);
+        if (curr_num > max_num)
+            max_num = curr_num;
+    }
+
+    closedir(dir);
+    }
+
+    max_num++;
+
+    snprintf(fmtstring, sizeof(fmtstring), "/%%s%%0%dd%%s", numberlen);
+    snprintf(buffer + pathlen, MAX_PATH - pathlen, fmtstring, prefix,
+             max_num, suffix);
+
+#ifdef IF_CNFN_NUM
+    if (num)
+        *num = max_num;
+#endif
+
+    return buffer;
+}
+
+
+#if CONFIG_RTC
+/* Create a filename with a date+time part.
+   It is allowed that buffer and path point to the same memory location,
+   saving a strcpy(). Path must always be given without trailing slash.
+   unique_time as true makes the function wait until the current time has
+   changed. */
+char *create_datetime_filename(char *buffer, const char *path,
+                               const char *prefix, const char *suffix,
+                               bool unique_time)
+{
+    struct tm *tm = get_time();
+    static struct tm last_tm;
+    int pathlen;
+
+    while (unique_time && !memcmp(get_time(), &last_tm, sizeof (struct tm)))
+        sleep(HZ/10);
+
+    last_tm = *tm;
+
+    if (buffer != path)
+        strncpy(buffer, path, MAX_PATH);
+
+    pathlen = strlen(buffer);
+    snprintf(buffer + pathlen, MAX_PATH - pathlen,
+             "/%s%02d%02d%02d-%02d%02d%02d%s", prefix,
+             tm->tm_year % 100, tm->tm_mon + 1, tm->tm_mday,
+             tm->tm_hour, tm->tm_min, tm->tm_sec, suffix);
+
+    return buffer;
+}
+#endif /* CONFIG_RTC */
diff --git a/firmware/usb.c b/firmware/usb.c
index a1e552a321..a720215731 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -42,7 +42,8 @@
 #ifdef HAVE_USBSTACK
 #include "usb_core.h"
 #endif
-#include "logf.h"
+#include "logf.h"  
+#include "screendump.h"
 
 /* Conditions under which we want the entire driver */
 #if !defined(BOOTLOADER) || (CONFIG_CPU == SH7034) || \
@@ -55,11 +56,6 @@
 
 #ifdef HAVE_LCD_BITMAP
 bool do_screendump_instead_of_usb = false;
-#if defined(USB_FULL_INIT) && defined(BOOTLOADER)
-static void screen_dump(void) {}
-#else
-void screen_dump(void);   /* Nasty again. Defined in apps/ too */
-#endif
 #endif
 
 #if !defined(SIMULATOR) && !defined(USB_NONE)
@@ -262,6 +258,9 @@ static void usb_thread(void)
                 {
                     usb_state = USB_SCREENDUMP;
                     screen_dump();
+#ifdef HAVE_REMOTE_LCD
+                    remote_screen_dump();
+#endif
                     break;
                 }
 #endif