diff options
author | Will Robertson <aliask@rockbox.org> | 2007-09-21 15:51:53 +0000 |
---|---|---|
committer | Will Robertson <aliask@rockbox.org> | 2007-09-21 15:51:53 +0000 |
commit | 590501cfe404b5463adecc70628e5bc7c8f142a2 (patch) | |
tree | 3b038f90c9c3bbef8cf0b84f5a4ea338f9599851 /tools/scramble.c | |
parent | a26110c52dff9bc15d20146462d52d07f61bd238 (diff) | |
download | rockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.tar.gz rockbox-590501cfe404b5463adecc70628e5bc7c8f142a2.zip |
Merge the Gigabeat S branch back into trunk. Fingers crossed nothing breaks.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14805 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools/scramble.c')
-rw-r--r-- | tools/scramble.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/tools/scramble.c b/tools/scramble.c index 9f18e96e85..8534d41832 100644 --- a/tools/scramble.c +++ b/tools/scramble.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <string.h> | 23 | #include <string.h> |
24 | #include "iriver.h" | 24 | #include "iriver.h" |
25 | #include "gigabeat.h" | 25 | #include "gigabeat.h" |
26 | #include "gigabeats.h" | ||
26 | #include "mi4.h" | 27 | #include "mi4.h" |
27 | 28 | ||
28 | int iaudio_encode(char *iname, char *oname, char *idstring); | 29 | int iaudio_encode(char *iname, char *oname, char *idstring); |
@@ -92,7 +93,8 @@ void usage(void) | |||
92 | "\t-ipod3g ipod firmware partition format (3rd Gen)\n" | 93 | "\t-ipod3g ipod firmware partition format (3rd Gen)\n" |
93 | "\t-ipod4g ipod firmware partition format (4th Gen, Mini, Nano, Photo/Color)\n" | 94 | "\t-ipod4g ipod firmware partition format (4th Gen, Mini, Nano, Photo/Color)\n" |
94 | "\t-ipod5g ipod firmware partition format (5th Gen - aka Video)\n" | 95 | "\t-ipod5g ipod firmware partition format (5th Gen - aka Video)\n" |
95 | "\t-gigabeat Toshiba Gigabeat format\n" | 96 | "\t-gigabeat Toshiba Gigabeat F/X format\n" |
97 | "\t-gigabeats Toshiba Gigabeat S format\n" | ||
96 | "\t-mi4v2 PortalPlayer .mi4 format (revision 010201)\n" | 98 | "\t-mi4v2 PortalPlayer .mi4 format (revision 010201)\n" |
97 | "\t-mi4v3 PortalPlayer .mi4 format (revision 010301)\n" | 99 | "\t-mi4v3 PortalPlayer .mi4 format (revision 010301)\n" |
98 | "\t-mi4r Sandisk Rhapsody .mi4 format\n" | 100 | "\t-mi4r Sandisk Rhapsody .mi4 format\n" |
@@ -231,6 +233,8 @@ int main (int argc, char** argv) | |||
231 | modelnum = 19; | 233 | modelnum = 19; |
232 | else if(!strcmp(&argv[1][5], "c200")) | 234 | else if(!strcmp(&argv[1][5], "c200")) |
233 | modelnum = 20; | 235 | modelnum = 20; |
236 | else if(!strcmp(&argv[1][5], "gigs")) | ||
237 | modelnum = 21; | ||
234 | else { | 238 | else { |
235 | fprintf(stderr, "unsupported model: %s\n", &argv[1][5]); | 239 | fprintf(stderr, "unsupported model: %s\n", &argv[1][5]); |
236 | return 2; | 240 | return 2; |
@@ -254,6 +258,12 @@ int main (int argc, char** argv) | |||
254 | gigabeat_code(iname, oname); | 258 | gigabeat_code(iname, oname); |
255 | return 0; | 259 | return 0; |
256 | } | 260 | } |
261 | else if(!strcmp(argv[1], "-gigabeats")) { | ||
262 | iname = argv[2]; | ||
263 | oname = argv[3]; | ||
264 | gigabeat_s_code(iname, oname); | ||
265 | return 0; | ||
266 | } | ||
257 | else if(!strcmp(argv[1], "-iaudiox5")) { | 267 | else if(!strcmp(argv[1], "-iaudiox5")) { |
258 | iname = argv[2]; | 268 | iname = argv[2]; |
259 | oname = argv[3]; | 269 | oname = argv[3]; |