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

1 files changed, 5 insertions, 6 deletions

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