Fix automatic rolo on new version for archos. Introduces new define in config files for bootfile location.

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

25 files changed, 28 insertions, 4 deletions

diff --git a/apps/misc.c b/apps/misc.c
index 0a313395bf..4e1de7a019 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -890,12 +890,12 @@ void check_bootfile(bool do_rolo)
     DIR* dir = NULL;
     struct dirent* entry = NULL;
 
-    /* 1. open ROCKBOX_DIR and find the BOOTFILE dir entry */
-    dir = opendir(ROCKBOX_DIR);
+    /* 1. open BOOTDIR and find the BOOTFILE dir entry */
+    dir = opendir(BOOTDIR);
 
     if(!dir) return; /* do we want an error splash? */
 
-    /* loop all files in ROCKBOX_DIR */
+    /* loop all files in BOOTDIR */
     while(0 != (entry = readdir(dir)))
     {
         if(!strcasecmp(entry->d_name, BOOTFILE))
@@ -911,7 +911,7 @@ void check_bootfile(bool do_rolo)
                     struct text_message message={ lines, 2 };
                     button_clear_queue(); /* Empty the keyboard buffer */
                     if(gui_syncyesno_run(&message, NULL, NULL) == YESNO_YES)
-                    rolo_load(ROCKBOX_DIR "/" BOOTFILE);
+                    rolo_load(BOOTDIR "/" BOOTFILE);
                 }
             }
             boot_size = entry->size;
diff --git a/firmware/export/config-e200.h b/firmware/export/config-e200.h
index 570043ad8a..efcb7ebfd5 100644
--- a/firmware/export/config-e200.h
+++ b/firmware/export/config-e200.h
@@ -128,6 +128,7 @@
 #define BOOTFILE_EXT    "mi4"
 #define BOOTFILE        "rockbox." BOOTFILE_EXT
 #define OLD_BOOTFILE    "rockbox.e200"
+#define BOOTDIR "/.rockbox"
 
 #define ICODE_ATTR_TREMOR_NOT_MDCT
 
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h
index 1b7bd190d6..000f425ee7 100644
--- a/firmware/export/config-fmrecorder.h
+++ b/firmware/export/config-fmrecorder.h
@@ -119,5 +119,6 @@
 
 #define BOOTFILE_EXT "ajz"
 #define BOOTFILE "ajbrec." BOOTFILE_EXT
+#define BOOTDIR "."
 
 #endif /* SIMULATOR */
diff --git a/firmware/export/config-gigabeat.h b/firmware/export/config-gigabeat.h
index f27dfa9326..fd97264707 100644
--- a/firmware/export/config-gigabeat.h
+++ b/firmware/export/config-gigabeat.h
@@ -130,6 +130,7 @@
 
 #define BOOTFILE_EXT "gigabeat"
 #define BOOTFILE "rockbox." BOOTFILE_EXT
+#define BOOTDIR "/.rockbox"
 
 #define HW_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \
                        SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_24 | \
diff --git a/firmware/export/config-h10.h b/firmware/export/config-h10.h
index 18f78efb91..2b7f965294 100644
--- a/firmware/export/config-h10.h
+++ b/firmware/export/config-h10.h
@@ -159,6 +159,7 @@
 #define BOOTFILE_EXT    "mi4"
 #define BOOTFILE        "rockbox." BOOTFILE_EXT
 #define OLD_BOOTFILE    "rockbox.h10"
+#define BOOTDIR "/.rockbox"
 
 #define ICODE_ATTR_TREMOR_NOT_MDCT
 
diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h
index f7fe700a3e..84ca26ba53 100644
--- a/firmware/export/config-h100.h
+++ b/firmware/export/config-h100.h
@@ -144,6 +144,7 @@
 
 #define BOOTFILE_EXT "iriver"
 #define BOOTFILE "rockbox." BOOTFILE_EXT
+#define BOOTDIR "/.rockbox"
 
 #define BOOTLOADER_ENTRYPOINT  0x001F0000
 #define FLASH_RAMIMAGE_ENTRY   0x00001000
diff --git a/firmware/export/config-h10_5gb.h b/firmware/export/config-h10_5gb.h
index 1df9462ee6..bbf3f2ffe6 100644
--- a/firmware/export/config-h10_5gb.h
+++ b/firmware/export/config-h10_5gb.h
@@ -142,6 +142,7 @@
 #define BOOTFILE_EXT    "mi4"
 #define BOOTFILE        "rockbox." BOOTFILE_EXT
 #define OLD_BOOTFILE    "rockbox.h10"
+#define BOOTDIR "/.rockbox"
 
 #define ICODE_ATTR_TREMOR_NOT_MDCT
 
diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h
index e7fb73ea0f..ebde63f260 100644
--- a/firmware/export/config-h120.h
+++ b/firmware/export/config-h120.h
@@ -137,6 +137,7 @@
 
 #define BOOTFILE_EXT "iriver"
 #define BOOTFILE "rockbox." BOOTFILE_EXT
+#define BOOTDIR "/.rockbox"
 
 #define BOOTLOADER_ENTRYPOINT  0x001F0000
 #define FLASH_RAMIMAGE_ENTRY   0x00001000
diff --git a/firmware/export/config-h300.h b/firmware/export/config-h300.h
index 383bd1c632..173b99e432 100644
--- a/firmware/export/config-h300.h
+++ b/firmware/export/config-h300.h
@@ -137,6 +137,7 @@
 
 #define BOOTFILE_EXT "iriver"
 #define BOOTFILE "rockbox." BOOTFILE_EXT
+#define BOOTDIR "/.rockbox"
 
 #define BOOTLOADER_ENTRYPOINT  0x001F0000
 #define FLASH_ENTRYPOINT       0x00001000
diff --git a/firmware/export/config-iaudiom5.h b/firmware/export/config-iaudiom5.h
index d714736035..d6e4195216 100644
--- a/firmware/export/config-iaudiom5.h
+++ b/firmware/export/config-iaudiom5.h
@@ -133,6 +133,7 @@
 
 #define BOOTFILE_EXT "iaudio"
 #define BOOTFILE "rockbox." BOOTFILE_EXT
+#define BOOTDIR "/.rockbox"

 
 #define BOOTLOADER_ENTRYPOINT  0x001F0000
 #define FLASH_ENTRYPOINT       0x00001000
diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h
index 90959db345..adcbfee551 100644
--- a/firmware/export/config-iaudiox5.h
+++ b/firmware/export/config-iaudiox5.h
@@ -151,6 +151,7 @@
 
 #define BOOTFILE_EXT "iaudio"
 #define BOOTFILE "rockbox." BOOTFILE_EXT
+#define BOOTDIR "/.rockbox"
 
 #define BOOTLOADER_ENTRYPOINT  0x001F0000
 #define FLASH_ENTRYPOINT       0x00001000
diff --git a/firmware/export/config-ifp7xx.h b/firmware/export/config-ifp7xx.h
index 575571eb97..1b0ea17984 100644
--- a/firmware/export/config-ifp7xx.h
+++ b/firmware/export/config-ifp7xx.h
@@ -102,6 +102,7 @@
 
 #define BOOTFILE_EXT "iriver"
 #define BOOTFILE "rockbox." BOOTFILE_EXT
+#define BOOTDIR "/.rockbox"
 
 #define IBSS_ATTR_VOICE_STACK
 #define ICODE_ATTR_TREMOR_NOT_MDCT
diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config-ipod3g.h
index 0ad247ca63..f3877cfdbc 100644
--- a/firmware/export/config-ipod3g.h
+++ b/firmware/export/config-ipod3g.h
@@ -129,6 +129,7 @@
 
 #define BOOTFILE_EXT "ipod"
 #define BOOTFILE "rockbox." BOOTFILE_EXT
+#define BOOTDIR "/.rockbox"
 
 #define ICODE_ATTR_TREMOR_NOT_MDCT
 
diff --git a/firmware/export/config-ipod4g.h b/firmware/export/config-ipod4g.h
index 70f1a27f1d..ab172afd2e 100644
--- a/firmware/export/config-ipod4g.h
+++ b/firmware/export/config-ipod4g.h
@@ -141,6 +141,7 @@
 
 #define BOOTFILE_EXT "ipod"
 #define BOOTFILE "rockbox." BOOTFILE_EXT
+#define BOOTDIR "/.rockbox"
 
 #define ICODE_ATTR_TREMOR_NOT_MDCT
 
diff --git a/firmware/export/config-ipodcolor.h b/firmware/export/config-ipodcolor.h
index 4f243d986e..5e3e5c3d62 100644
--- a/firmware/export/config-ipodcolor.h
+++ b/firmware/export/config-ipodcolor.h
@@ -132,6 +132,7 @@
 
 #define BOOTFILE_EXT "ipod"
 #define BOOTFILE "rockbox." BOOTFILE_EXT
+#define BOOTDIR "/.rockbox"
 
 #define ICODE_ATTR_TREMOR_NOT_MDCT
 
diff --git a/firmware/export/config-ipodmini.h b/firmware/export/config-ipodmini.h
index 296a4c6158..40987d6b2c 100644
--- a/firmware/export/config-ipodmini.h
+++ b/firmware/export/config-ipodmini.h
@@ -135,6 +135,7 @@
 
 #define BOOTFILE_EXT "ipod"
 #define BOOTFILE "rockbox." BOOTFILE_EXT
+#define BOOTDIR "/.rockbox"
 
 #define ICODE_ATTR_TREMOR_NOT_MDCT
 
diff --git a/firmware/export/config-ipodmini2g.h b/firmware/export/config-ipodmini2g.h
index 6906f0eecd..80e2820339 100644
--- a/firmware/export/config-ipodmini2g.h
+++ b/firmware/export/config-ipodmini2g.h
@@ -141,6 +141,7 @@
 
 #define BOOTFILE_EXT "ipod"
 #define BOOTFILE "rockbox." BOOTFILE_EXT
+#define BOOTDIR "/.rockbox"
 
 #define ICODE_ATTR_TREMOR_NOT_MDCT
 
diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h
index da041526db..d32e45d17f 100644
--- a/firmware/export/config-ipodnano.h
+++ b/firmware/export/config-ipodnano.h
@@ -137,6 +137,7 @@
 
 #define BOOTFILE_EXT "ipod"
 #define BOOTFILE "rockbox." BOOTFILE_EXT
+#define BOOTDIR "/.rockbox"
 
 #define ICODE_ATTR_TREMOR_NOT_MDCT
 
diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config-ipodvideo.h
index 6626c237b1..f9cc50d520 100644
--- a/firmware/export/config-ipodvideo.h
+++ b/firmware/export/config-ipodvideo.h
@@ -141,6 +141,7 @@
 
 #define BOOTFILE_EXT "ipod"
 #define BOOTFILE "rockbox." BOOTFILE_EXT
+#define BOOTDIR "/.rockbox"
 
 #define ICODE_ATTR_TREMOR_NOT_MDCT
 
diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h
index ca6cde3e05..6815a74d95 100644
--- a/firmware/export/config-ondiofm.h
+++ b/firmware/export/config-ondiofm.h
@@ -122,5 +122,6 @@
 
 #define BOOTFILE_EXT "ajz"
 #define BOOTFILE "ajbrec." BOOTFILE_EXT
+#define BOOTDIR "."
 
 #endif /* SIMULATOR */
diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h
index 77746d6a95..2623aee6fa 100644
--- a/firmware/export/config-ondiosp.h
+++ b/firmware/export/config-ondiosp.h
@@ -109,5 +109,6 @@
 
 #define BOOTFILE_EXT "ajz"
 #define BOOTFILE "ajbrec." BOOTFILE_EXT
+#define BOOTDIR "."
 
 #endif /* SIMULATOR */
diff --git a/firmware/export/config-player.h b/firmware/export/config-player.h
index e462ef2d8e..0bd995ef15 100644
--- a/firmware/export/config-player.h
+++ b/firmware/export/config-player.h
@@ -91,5 +91,6 @@
 
 #define BOOTFILE_EXT "mod"
 #define BOOTFILE "archos." BOOTFILE_EXT
+#define BOOTDIR "."
 
 #endif /* SIMULATOR */
diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h
index b9759ddeac..cc87182974 100644
--- a/firmware/export/config-recorder.h
+++ b/firmware/export/config-recorder.h
@@ -106,5 +106,6 @@
 
 #define BOOTFILE_EXT "ajz"
 #define BOOTFILE "ajbrec." BOOTFILE_EXT
+#define BOOTDIR "."
 
 #endif /* SIMULATOR */
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h
index 0568879066..f5d5cd6d1c 100644
--- a/firmware/export/config-recorderv2.h
+++ b/firmware/export/config-recorderv2.h
@@ -119,5 +119,6 @@
 
 #define BOOTFILE_EXT "ajz"
 #define BOOTFILE "ajbrec." BOOTFILE_EXT
+#define BOOTDIR "."
 
 #endif /* SIMULATOR */
diff --git a/firmware/export/config-tpj1022.h b/firmware/export/config-tpj1022.h
index 8c6ba609df..5837b0f01f 100644
--- a/firmware/export/config-tpj1022.h
+++ b/firmware/export/config-tpj1022.h
@@ -122,5 +122,6 @@
 
 #define BOOTFILE_EXT "elio"
 #define BOOTFILE "rockbox." BOOTFILE_EXT
+#define BOOTDIR "/.rockbox"
 
 #endif