summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2017-06-18 13:04:12 +0200
committerAmaury Pouly <amaury.pouly@gmail.com>2017-06-18 13:35:42 +0200
commit8d5dcd395d0150abf4ec7b5a721ff003e2f9772d (patch)
treeaf9db0ab8795917156acdd7b5607646b96146986
parent365a0050384692b9b308de2d83b7d951e63d567c (diff)
downloadrockbox-8d5dcd395d0150abf4ec7b5a721ff003e2f9772d.tar.gz
rockbox-8d5dcd395d0150abf4ec7b5a721ff003e2f9772d.zip
nwztools/scsitool: print error on check sense
The detailled error message is only printed if -d switch is on command line, otherwise there is no error message which is wrong so fix that. Change-Id: I397541c467940e9b290ee8d4ae704368b1ce132b
-rw-r--r--utils/nwztools/scsitools/scsitool.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/utils/nwztools/scsitools/scsitool.c b/utils/nwztools/scsitools/scsitool.c
index e6051067b7..6c3527713e 100644
--- a/utils/nwztools/scsitools/scsitool.c
+++ b/utils/nwztools/scsitools/scsitool.c
@@ -263,7 +263,10 @@ int get_dnk_prop(int argc, char **argv)
263 int buffer_size = prop.size; 263 int buffer_size = prop.size;
264 int ret = do_dnk_cmd(true, prop.cmd, prop.subcmd, 0, buffer, &buffer_size); 264 int ret = do_dnk_cmd(true, prop.cmd, prop.subcmd, 0, buffer, &buffer_size);
265 if(ret) 265 if(ret)
266 {
267 cprintf(GREY, "An error occured during request\n");
266 return ret; 268 return ret;
269 }
267 if(buffer_size == 0) 270 if(buffer_size == 0)
268 { 271 {
269 cprintf(GREY, "Device didn't send any data\n"); 272 cprintf(GREY, "Device didn't send any data\n");
@@ -497,6 +500,7 @@ int get_dnk_nvp(int argc, char **argv)
497 ret = read_nvp_node(node_index, buffer, &size); 500 ret = read_nvp_node(node_index, buffer, &size);
498 if(ret != 0) 501 if(ret != 0)
499 { 502 {
503 cprintf(GREY, "An error occured during request\n");
500 free(buffer); 504 free(buffer);
501 return ret; 505 return ret;
502 } 506 }
@@ -588,10 +592,13 @@ int get_dpcc_prop(int argc, char **argv)
588 int buffer_size = prop.size; 592 int buffer_size = prop.size;
589 int ret = do_dpcc_cmd(0, &prop, buffer, &buffer_size); 593 int ret = do_dpcc_cmd(0, &prop, buffer, &buffer_size);
590 if(ret) 594 if(ret)
595 {
596 cprintf(GREY, "An error occured during request\n");
591 return ret; 597 return ret;
598 }
592 if(buffer_size < prop.size) 599 if(buffer_size < prop.size)
593 buffer[buffer_size] = 0; 600 buffer[buffer_size] = 0;
594 cprintf_field("Property: ", "%s\n", buffer); 601 cprintf_field("Raw data: ", "%s\n", buffer);
595 return 0; 602 return 0;
596} 603}
597 604
@@ -617,7 +624,10 @@ int get_user_time(int argc, char **argv)
617 int buffer_size = 32; 624 int buffer_size = 32;
618 int ret = do_dpcc_cmd(1, NULL, buffer, &buffer_size); 625 int ret = do_dpcc_cmd(1, NULL, buffer, &buffer_size);
619 if(ret) 626 if(ret)
627 {
628 cprintf(GREY, "An error occured during request\n");
620 return ret; 629 return ret;
630 }
621 struct user_timer_t *time = buffer; 631 struct user_timer_t *time = buffer;
622 cprintf_field("User Time: ", "%02x/%02x/%02x%02x %02x:%02x:%02x\n", 632 cprintf_field("User Time: ", "%02x/%02x/%02x%02x %02x:%02x:%02x\n",
623 time->day, time->month, time->year[0], time->year[1], time->hour, 633 time->day, time->month, time->year[0], time->year[1], time->hour,
@@ -666,7 +676,10 @@ int do_fw_upgrade(int argc, char **argv)
666 return ret; 676 return ret;
667 ret = do_sense_analysis(ret, sense, sense_size); 677 ret = do_sense_analysis(ret, sense, sense_size);
668 if(ret) 678 if(ret)
679 {
680 cprintf(GREY, "An error occured during request\n");
669 return ret; 681 return ret;
682 }
670 buffer[buffer_size] = 0; 683 buffer[buffer_size] = 0;
671 cprintf_field("Result:", "\n"); 684 cprintf_field("Result:", "\n");
672 print_hex(buffer, buffer_size); 685 print_hex(buffer, buffer_size);