diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2017-10-17 13:05:58 +0200 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2017-10-17 13:05:58 +0200 |
commit | 9a8a52cb077a086b3881c8e182b8259443519041 (patch) | |
tree | e80fa7d5fa6b1aa1786bfc39c0815a2124aa1f7e /utils/nwztools/scsitools | |
parent | 69223234666afdf739483b64a41e3419f5a00f69 (diff) | |
download | rockbox-9a8a52cb077a086b3881c8e182b8259443519041.tar.gz rockbox-9a8a52cb077a086b3881c8e182b8259443519041.zip |
nwztools/scsitool: slightly rework of help_us and help
Now print list of devices immediately even if the rest of the command line
is empty (ie 'scsitool -s ?' works, whereas before one would need an actual
device to even get a list). Add more information in the help_us command:
print kas, lyr and fpi.
Change-Id: Icfeeaeebe28c774a74ca54661357fafa25c3d114
Diffstat (limited to 'utils/nwztools/scsitools')
-rw-r--r-- | utils/nwztools/scsitools/scsitool.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/utils/nwztools/scsitools/scsitool.c b/utils/nwztools/scsitools/scsitool.c index 5a359177dd..ee8c0b16e4 100644 --- a/utils/nwztools/scsitools/scsitool.c +++ b/utils/nwztools/scsitools/scsitool.c | |||
@@ -336,11 +336,7 @@ int get_model_and_series(int *model_index, int *series_index) | |||
336 | /* display list on error */ | 336 | /* display list on error */ |
337 | if(*series_index == -1) | 337 | if(*series_index == -1) |
338 | { | 338 | { |
339 | if(strcmp(g_force_series, "?") != 0) | 339 | cprintf(GREY, "Unrecognized series '%s', use -s ? to get a list of supported devices\n", g_force_series); |
340 | cprintf(GREY, "Unrecognized series '%s'\n", g_force_series); | ||
341 | cprintf(OFF, "Series list:\n"); | ||
342 | for(int i = 0; i < NWZ_SERIES_COUNT; i++) | ||
343 | printf(" %-10s %s\n", nwz_series[i].codename, nwz_series[i].name); | ||
344 | return -1; | 340 | return -1; |
345 | } | 341 | } |
346 | } | 342 | } |
@@ -987,6 +983,9 @@ void help_us(bool unsupported, unsigned long model_id) | |||
987 | cprintf(BLUE, "-------------------[ Paste information below ]-------------------\n"); | 983 | cprintf(BLUE, "-------------------[ Paste information below ]-------------------\n"); |
988 | cprintf_field("Model ID: ", "%#lx\n", model_id); | 984 | cprintf_field("Model ID: ", "%#lx\n", model_id); |
989 | get_dev_info(0, NULL); | 985 | get_dev_info(0, NULL); |
986 | get_dhp(0, NULL); | ||
987 | static char *list[] = { "kas", "lyr", "fpi" }; | ||
988 | get_dnk_nvp_multi(sizeof(list) / sizeof(list[0]), list); | ||
990 | } | 989 | } |
991 | 990 | ||
992 | int main(int argc, char **argv) | 991 | int main(int argc, char **argv) |
@@ -1029,6 +1028,15 @@ int main(int argc, char **argv) | |||
1029 | } | 1028 | } |
1030 | } | 1029 | } |
1031 | 1030 | ||
1031 | /* list devices */ | ||
1032 | if(g_force_series && strcmp(g_force_series, "?") == 0) | ||
1033 | { | ||
1034 | cprintf(OFF, "Series list:\n"); | ||
1035 | for(int i = 0; i < NWZ_SERIES_COUNT; i++) | ||
1036 | printf(" %-10s %s\n", nwz_series[i].codename, nwz_series[i].name); | ||
1037 | return 0; | ||
1038 | } | ||
1039 | |||
1032 | if(argc - optind < 2) | 1040 | if(argc - optind < 2) |
1033 | { | 1041 | { |
1034 | usage(); | 1042 | usage(); |