Change the MODEL_NUMBER for various new ports so that it is unique again.

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

8 files changed, 15 insertions, 13 deletions

diff --git a/firmware/export/config-logikdax.h b/firmware/export/config-logikdax.h
index d31f0ba415..0a2925128a 100644
--- a/firmware/export/config-logikdax.h
+++ b/firmware/export/config-logikdax.h
@@ -4,7 +4,7 @@
 #define TARGET_TREE /* this target is using the target tree system */
 
 /* For Rolo and boot loader */
-#define MODEL_NUMBER 27
+#define MODEL_NUMBER 33
 
 #define MODEL_NAME   "Logik DAX MP3/DAB"
 
@@ -94,6 +94,8 @@
 /* Define this if you have ATA power-off control */
 #define HAVE_ATA_POWER_OFF
 
+#define HAVE_FAT16SUPPORT
+
 /* Define this to the CPU frequency */
 #define CPU_FREQ      120000000
 
diff --git a/firmware/export/config-meizu-m3.h b/firmware/export/config-meizu-m3.h
index 7a07339bcb..763fa49fbf 100644
--- a/firmware/export/config-meizu-m3.h
+++ b/firmware/export/config-meizu-m3.h
@@ -4,7 +4,7 @@
 #define TARGET_TREE /* this target is using the target tree system */
 
 /* For Rolo and boot loader */
-#define MODEL_NUMBER 1
+#define MODEL_NUMBER 39
 
 #define MODEL_NAME   "Meizu M3"
 
diff --git a/firmware/export/config-meizu-m6sl.h b/firmware/export/config-meizu-m6sl.h
index f10f548dd3..b2719501f7 100644
--- a/firmware/export/config-meizu-m6sl.h
+++ b/firmware/export/config-meizu-m6sl.h
@@ -4,7 +4,7 @@
 #define TARGET_TREE /* this target is using the target tree system */
 
 /* For Rolo and boot loader */
-#define MODEL_NUMBER 1
+#define MODEL_NUMBER 38
 
 #define MODEL_NAME   "Meizu M6SL"
 
diff --git a/firmware/export/config-meizu-m6sp.h b/firmware/export/config-meizu-m6sp.h
index 4867904f4d..a78d239c2d 100644
--- a/firmware/export/config-meizu-m6sp.h
+++ b/firmware/export/config-meizu-m6sp.h
@@ -4,7 +4,7 @@
 #define TARGET_TREE /* this target is using the target tree system */
 
 /* For Rolo and boot loader */
-#define MODEL_NUMBER 1
+#define MODEL_NUMBER 37
 
 #define MODEL_NAME   "Meizu M6SP"
 
diff --git a/firmware/export/config-ondavx747.h b/firmware/export/config-ondavx747.h
index 9a7f53568a..6da9725aab 100644
--- a/firmware/export/config-ondavx747.h
+++ b/firmware/export/config-ondavx747.h
@@ -31,7 +31,7 @@
 #define MODEL_NAME  "Onda VX747"
 
 /* For Rolo and boot loader */
-#define MODEL_NUMBER 30
+#define MODEL_NUMBER 35
 
 /* define this if you use an ATA controller */
 //#define HAVE_ATA
diff --git a/firmware/export/config-ondavx767.h b/firmware/export/config-ondavx767.h
index a72b73ba32..6a44bf4aff 100644
--- a/firmware/export/config-ondavx767.h
+++ b/firmware/export/config-ondavx767.h
@@ -31,7 +31,7 @@
 #define MODEL_NAME  "Onda VX767"
 
 /* For Rolo and boot loader */
-#define MODEL_NUMBER 31
+#define MODEL_NUMBER 36
 
 /* define this if you use an ATA controller */
 //#define HAVE_ATA
diff --git a/firmware/export/config-sa9200.h b/firmware/export/config-sa9200.h
index 9cdfe6bba7..4d9c28af1e 100755
--- a/firmware/export/config-sa9200.h
+++ b/firmware/export/config-sa9200.h
@@ -4,7 +4,7 @@
 #define TARGET_TREE /* this target is using the target tree system */
 
 /* For Rolo and boot loader */
-#define MODEL_NUMBER 26
+#define MODEL_NUMBER 34
 #define MODEL_NAME   "Philips GoGear SA200"
 
 #define HW_SAMPR_CAPS       (SAMPR_CAP_44)
diff --git a/tools/scramble.c b/tools/scramble.c
index 3b2ff67291..649af6e408 100644
--- a/tools/scramble.c
+++ b/tools/scramble.c
@@ -275,16 +275,16 @@ int main (int argc, char** argv)
             modelnum = 24;
         else if(!strcmp(&argv[1][5], "iam3"))
             modelnum = 25;
-        else if(!strcmp(&argv[1][5], "9200")) /* Philips SA9200 */
-            modelnum = 26;
-        else if (!strcmp(&argv[1][5], "ldax"))
-            modelnum = 27;
         else if (!strcmp(&argv[1][5], "m200"))
-            modelnum = 29;
+            modelnum = 29;
         else if(!strcmp(&argv[1][5], "1630")) /* Philips HDD1630 */
             modelnum = 31;
         else if (!strcmp(&argv[1][5], "i7"))
-            modelnum = 32;
+            modelnum = 32;
+        else if (!strcmp(&argv[1][5], "ldax"))
+            modelnum = 33;
+        else if(!strcmp(&argv[1][5], "9200")) /* Philips SA9200 */
+            modelnum = 34;
         else {
             fprintf(stderr, "unsupported model: %s\n", &argv[1][5]);
             return 2;