Bootloader support to search firmware also from flash. Bootloader <->

Rockbox communication when Rockbox has been flashed.


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

3 files changed, 12 insertions, 7 deletions

diff --git a/apps/main.c b/apps/main.c
index 907e1126cf..d590790a85 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -120,7 +120,9 @@ int init_dircache(void)
 # ifdef HAVE_EEPROM
         if (firmware_settings.initialized && firmware_settings.disk_clean)
         {
-            if (dircache_load(DIRCACHE_FILE) == 0)
+            result = dircache_load(DIRCACHE_FILE);
+            remove(DIRCACHE_FILE);
+            if (result == 0)
                 return 0;
         }
 # endif
diff --git a/apps/plugins/iriver_flash.c b/apps/plugins/iriver_flash.c
index 28734d197b..40c9a2979b 100644
--- a/apps/plugins/iriver_flash.c
+++ b/apps/plugins/iriver_flash.c
@@ -381,12 +381,13 @@ void show_fatal_error(void)
 
 int flash_bootloader(const char *filename)
 {
-    // char buf[32];
+    char buf[32];
     int pos, i, len, rc;
     unsigned long checksum, sum, crc32;
     unsigned char *p8;
     uint16_t *p16;
     
+    (void)buf;
     len = load_firmware_file(filename, &checksum);
     if (len < 0)
         return len * 10;
@@ -399,15 +400,16 @@ int flash_bootloader(const char *filename)
     
     /* Verify the crc32 checksum also. */
     crc32 = crc_32(audiobuf, len, 0xffffffff);
-    // rb->snprintf(buf, sizeof buf, "crc32 = 0x%08x", crc32);
-    // rb->splash(HZ*10, true, buf);
-    
-    if (crc32 != 0x5361a679)
+#if 0
+    rb->snprintf(buf, sizeof buf, "crc32 = 0x%08x", crc32);
+    rb->splash(HZ*10, true, buf);
+#else
+    if (crc32 != 0xa930906d)
     {
         rb->splash(HZ*3, true, "Untested bootloader");
         return -2;
     }
-    
+#endif
     rb->lcd_puts(0, 3, "Processing critical sections...");
     rb->lcd_update();
 
diff --git a/apps/plugins/viewers.config b/apps/plugins/viewers.config
index 5e1c6283f8..cc05bbc47d 100644
--- a/apps/plugins/viewers.config
+++ b/apps/plugins/viewers.config
@@ -22,3 +22,4 @@ wav,viewers/mp3_encoder, 00 00 00 00 00 00
 wav,viewers/wavplay,60 7F 05 35 3F 00
 bmp,rocks/rockpaint, 01 10 01 10 01 10
 m2v,viewers/mpegplayer,5D 7F 5D 7F 5D 7F
+iriver,viewers/iriver_flash,2A 7F 41 41 7F 2A