A modern Music Player Daemon based on Rockbox open source high quality audio player
libadwaita audio rust zig deno mpris rockbox mpd

tools/scramble: add support for a couple more Creative devices

This is mostly for consistency, this tool will be unused by the newer targets.
Also update the usage() display to mention -no-ciff

Change-Id: I4500f5fdce771ad3c53701a0bbaace916e88759d

+15 -5
+5 -1
tools/creative.c
··· 140 140 /* Creative ZEN V */ 141 141 {"C\0r\0e\0a\0t\0i\0v\0e\0 \0Z\0E\0N\0 \0V", 42, null_key_v4}, 142 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 /*
+3 -1
tools/creative.h
··· 28 28 ZENVISIONM60 = 1, 29 29 ZENVISION = 2, 30 30 ZENV = 3, 31 - ZEN = 4 31 + ZEN = 4, 32 + ZENXFI = 5, 33 + ZENMOZAIC = 6 32 34 }; 33 35 34 36 struct device_info
+7 -3
tools/scramble.c
··· 107 107 printf("\t-ipod3g ipod firmware partition format (3rd Gen)\n" 108 108 "\t-ipod4g ipod firmware partition format (4th Gen, Mini, Nano, Photo/Color)\n" 109 109 "\t-ipod5g ipod firmware partition format (5th Gen - aka Video)\n" 110 - "\t-creative=X Creative firmware structure format\n" 111 - "\t (X values: zvm, zvm60, zenvision\n" 112 - "\t zenv, zen\n"); 110 + "\t-creative=X [-no-ciff] Creative firmware structure format\n" 111 + "\t (X values: zvm, zvm60, zenvision, zenv, zen,\n" 112 + "\t zenxfi, zenmozaic)\n"); 113 113 printf("\t-gigabeat Toshiba Gigabeat F/X format\n" 114 114 "\t-gigabeats Toshiba Gigabeat S format\n" 115 115 "\t-mi4v2 PortalPlayer .mi4 format (revision 010201)\n" ··· 455 455 return zvm_encode(iname, oname, ZENV, creative_enable_ciff); 456 456 else if(!strcmp(&argv[1][10], "zen")) 457 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 462 else 459 463 { 460 464 fprintf(stderr, "unsupported Creative device: %s\n", &argv[1][10]);