diff options
-rw-r--r-- | tools/creative.c | 6 | ||||
-rw-r--r-- | tools/creative.h | 4 | ||||
-rw-r--r-- | tools/scramble.c | 10 |
3 files changed, 15 insertions, 5 deletions
diff --git a/tools/creative.c b/tools/creative.c index 5c4a236a52..a8548444ff 100644 --- a/tools/creative.c +++ b/tools/creative.c | |||
@@ -140,7 +140,11 @@ static const struct device_info devices[] = | |||
140 | /* Creative ZEN V */ | 140 | /* Creative ZEN V */ |
141 | {"C\0r\0e\0a\0t\0i\0v\0e\0 \0Z\0E\0N\0 \0V", 42, null_key_v4}, | 141 | {"C\0r\0e\0a\0t\0i\0v\0e\0 \0Z\0E\0N\0 \0V", 42, null_key_v4}, |
142 | /* Creative ZEN */ | 142 | /* Creative ZEN */ |
143 | {"C\0r\0e\0a\0t\0i\0v\0e\0 \0Z\0E\0N", 48, null_key_v3} | 143 | {"C\0r\0e\0a\0t\0i\0v\0e\0 \0Z\0E\0N", 48, null_key_v3}, |
144 | /* Creative ZEN X-Fi */ | ||
145 | {"C\0r\0e\0a\0t\0i\0v\0e\0 \0Z\0E\0N\0 \0X\0-\0F\0i\0", 34, null_key_v4}, | ||
146 | /* Creative ZEN Mozaic */ | ||
147 | {"C\0r\0e\0a\0t\0i\0v\0e\0 \0Z\0E\0N\0 \0M\0o\0z\0a\0i\0c\0", 38, null_key_v4} | ||
144 | }; | 148 | }; |
145 | 149 | ||
146 | /* | 150 | /* |
diff --git a/tools/creative.h b/tools/creative.h index ee2cf90582..531336aa32 100644 --- a/tools/creative.h +++ b/tools/creative.h | |||
@@ -28,7 +28,9 @@ enum | |||
28 | ZENVISIONM60 = 1, | 28 | ZENVISIONM60 = 1, |
29 | ZENVISION = 2, | 29 | ZENVISION = 2, |
30 | ZENV = 3, | 30 | ZENV = 3, |
31 | ZEN = 4 | 31 | ZEN = 4, |
32 | ZENXFI = 5, | ||
33 | ZENMOZAIC = 6 | ||
32 | }; | 34 | }; |
33 | 35 | ||
34 | struct device_info | 36 | struct device_info |
diff --git a/tools/scramble.c b/tools/scramble.c index 7b164e0899..c29634bb6c 100644 --- a/tools/scramble.c +++ b/tools/scramble.c | |||
@@ -107,9 +107,9 @@ void usage(void) | |||
107 | printf("\t-ipod3g ipod firmware partition format (3rd Gen)\n" | 107 | printf("\t-ipod3g ipod firmware partition format (3rd Gen)\n" |
108 | "\t-ipod4g ipod firmware partition format (4th Gen, Mini, Nano, Photo/Color)\n" | 108 | "\t-ipod4g ipod firmware partition format (4th Gen, Mini, Nano, Photo/Color)\n" |
109 | "\t-ipod5g ipod firmware partition format (5th Gen - aka Video)\n" | 109 | "\t-ipod5g ipod firmware partition format (5th Gen - aka Video)\n" |
110 | "\t-creative=X Creative firmware structure format\n" | 110 | "\t-creative=X [-no-ciff] Creative firmware structure format\n" |
111 | "\t (X values: zvm, zvm60, zenvision\n" | 111 | "\t (X values: zvm, zvm60, zenvision, zenv, zen,\n" |
112 | "\t zenv, zen\n"); | 112 | "\t zenxfi, zenmozaic)\n"); |
113 | printf("\t-gigabeat Toshiba Gigabeat F/X format\n" | 113 | printf("\t-gigabeat Toshiba Gigabeat F/X format\n" |
114 | "\t-gigabeats Toshiba Gigabeat S format\n" | 114 | "\t-gigabeats Toshiba Gigabeat S format\n" |
115 | "\t-mi4v2 PortalPlayer .mi4 format (revision 010201)\n" | 115 | "\t-mi4v2 PortalPlayer .mi4 format (revision 010201)\n" |
@@ -455,6 +455,10 @@ int main (int argc, char** argv) | |||
455 | return zvm_encode(iname, oname, ZENV, creative_enable_ciff); | 455 | return zvm_encode(iname, oname, ZENV, creative_enable_ciff); |
456 | else if(!strcmp(&argv[1][10], "zen")) | 456 | else if(!strcmp(&argv[1][10], "zen")) |
457 | return zvm_encode(iname, oname, ZEN, creative_enable_ciff); | 457 | return zvm_encode(iname, oname, ZEN, creative_enable_ciff); |
458 | else if(!strcmp(&argv[1][10], "zenxfi")) | ||
459 | return zvm_encode(iname, oname, ZENXFI, creative_enable_ciff); | ||
460 | else if(!strcmp(&argv[1][10], "zenmozaic")) | ||
461 | return zvm_encode(iname, oname, ZENMOZAIC, creative_enable_ciff); | ||
458 | else | 462 | else |
459 | { | 463 | { |
460 | fprintf(stderr, "unsupported Creative device: %s\n", &argv[1][10]); | 464 | fprintf(stderr, "unsupported Creative device: %s\n", &argv[1][10]); |