1) Split ZVM into 30GB and 60GB

2) Clean up config
3) Add scramble description


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

firmware/export/config-creativezvm.h

@@ -56,8 +56,13 @@
 /* choose the lcd orientation. both work */
 #define CONFIG_ORIENTATION SCREEN_PORTRAIT
 
+#ifdef ZEN_VISION
+#define LCD_WIDTH  640
+#define LCD_HEIGHT 480
+#else
 #define LCD_WIDTH  320
 #define LCD_HEIGHT 240
+#endif
 
 #define LCD_DEPTH  16   /* 65k colours */
 #define LCD_PIXELFORMAT RGB565 /* rgb565 */
@@ -105,7 +110,7 @@
 #define CONFIG_I2C I2C_DM320
 
 /* TLV320 has no tone controls, so we use the software ones */
-//#define HAVE_SW_TONE_CONTROLS
+#define HAVE_SW_TONE_CONTROLS
 
 /*#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | \
     SAMPR_CAP_11)*/
@@ -134,7 +139,7 @@
 #define CPU_FREQ 16934400
 
 /* Define this if you have ATA power-off control */
-//#define HAVE_ATA_POWER_OFF
+#define HAVE_ATA_POWER_OFF
 
 /* Virtual LED (icon) */
 #define CONFIG_LED LED_VIRTUAL
@@ -151,10 +156,12 @@
 /* Define this if you have adjustable CPU frequency */
 /* #define HAVE_ADJUSTABLE_CPU_FREQ */
 
-#ifndef ZEN_VISION
+#ifdef ZEN_VISION
-#define BOOTFILE_EXT "zvm"
-#else
  #define BOOTFILE_EXT "zv"
+#elseif defined(ZVM_60GB)
+ #define BOOTFILE_EXT "zvm60"
+#else
+ #define BOOTFILE_EXT "zvm"
 #endif
 #define BOOTFILE "rockbox." BOOTFILE_EXT
 #define BOOTDIR "/.rockbox"
@@ -164,13 +171,12 @@
 #define USB_VENDOR_ID 0x041e 
 #define USB_PRODUCT_ID 0x4133
 
-//DEBUGGING!
+/*DEBUGGING!*/
 #ifdef BOOTLOADER
 #define THREAD_EXTRA_CHECKS 1
 #define DEBUG 1
 #define debug(msg) printf(msg)
 #define BUTTON_DEBUG
+#endif
 
-#define DO_THREAD_TEST
-#endif
 #endif

tools/configure

@@ -677,8 +677,9 @@ cat <<EOF
  60) Elio TPJ-1022     70) M:Robe 500         80) DAX 1GB MP3/DAB
                        71) M:Robe 100
  ==Creative==
- 90) Zen Vision:M
+ 90) Zen Vision:M 30GB
- 91) Zen Vision
+ 91) Zen Vision:M 60GB
+ 92) Zen Vision
 
 EOF
 
@@ -1476,7 +1477,31 @@ fi
     t_model="creative-zvm"
     ;;
     
-    91|creativezenvision)
+    91|creativezvm60gb)
+    target_id=40
+    modelname="creativezvm"
+    target="-DCREATIVE_ZVM -DZVM_60GB"
+    memory=64
+    arm926ejscc
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
+    bmp2rb_remotemono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_remotenative="$rootdir/tools/bmp2rb -f 0"
+    tool="$rootdir/tools/scramble -creative=zvm60"
+    output="rockbox.zvm60"
+    appextra="recorder:gui"
+    plugins=""
+    swcodec="yes"
+    toolset=$ipodbitmaptools
+    boottool="$rootdir/tools/scramble -creative=zvm60"
+    bootoutput="rockbox.zvm60boot"
+    # architecture, manufacturer and model for the target-tree build
+    t_cpu="arm"
+    t_manufacturer="tms320dm320"
+    t_model="creative-zvm"
+    ;;
+    
+    92|creativezenvision)
     target_id=39
     modelname="creativezm"
     target="-DCREATIVE_ZVM -DZEN_VISION"

tools/scramble.c

@@ -104,7 +104,9 @@ void usage(void)
            "\t-ipod4g ipod firmware partition format (4th Gen, Mini, Nano, Photo/Color)\n"
            "\t-ipod5g ipod firmware partition format (5th Gen - aka Video)\n"
            "\t-creative=X Creative firmware structure format\n"
-           "\t-gigabeat Toshiba Gigabeat F/X format\n"
+           "\t            (X values: zvm, zvm60, zenvision\n"
+           "\t                       zenv, zen\n");
+    printf("\t-gigabeat Toshiba Gigabeat F/X format\n"
            "\t-gigabeats Toshiba Gigabeat S format\n"
            "\t-mi4v2  PortalPlayer .mi4 format (revision 010201)\n"
            "\t-mi4v3  PortalPlayer .mi4 format (revision 010301)\n"