diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2014-02-22 20:27:32 +0100 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2014-02-22 20:27:32 +0100 |
commit | c02bc1afd2a2400a41a863918bfe4eaf0255d60d (patch) | |
tree | a116567deb994e36c5259ce86df3e3fbaa327557 | |
parent | aae249c206555f1481348248352471f8e4cc5ae5 (diff) | |
download | rockbox-c02bc1afd2a2400a41a863918bfe4eaf0255d60d.tar.gz rockbox-c02bc1afd2a2400a41a863918bfe4eaf0255d60d.zip |
imxtools/scsitools: increase SCSI delay to 10 seconds
On some OSes like Windows or if running in a virtual machine, the one second
timeout might be too short.
Change-Id: I717f7a2aaed1cb3d40e8fbe6f9b1081b43ceea95
-rw-r--r-- | firmware/target/arm/imx233/audioout-imx233.c | 1 | ||||
-rw-r--r-- | utils/imxtools/scsitools/scsitool.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/firmware/target/arm/imx233/audioout-imx233.c b/firmware/target/arm/imx233/audioout-imx233.c index 3b6203ea44..c4b40340bc 100644 --- a/firmware/target/arm/imx233/audioout-imx233.c +++ b/firmware/target/arm/imx233/audioout-imx233.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include "rtc-imx233.h" | 28 | #include "rtc-imx233.h" |
29 | #include "pcm_sampr.h" | 29 | #include "pcm_sampr.h" |
30 | #include "audio-target.h" | 30 | #include "audio-target.h" |
31 | #include "power-imx233.h" | ||
31 | 32 | ||
32 | #ifndef IMX233_AUDIO_COUPLING_MODE | 33 | #ifndef IMX233_AUDIO_COUPLING_MODE |
33 | #error You must define IMX233_AUDIO_COUPLING_MODE | 34 | #error You must define IMX233_AUDIO_COUPLING_MODE |
diff --git a/utils/imxtools/scsitools/scsitool.c b/utils/imxtools/scsitools/scsitool.c index a94260b717..2e364dcb17 100644 --- a/utils/imxtools/scsitools/scsitool.c +++ b/utils/imxtools/scsitools/scsitool.c | |||
@@ -137,7 +137,7 @@ int do_scsi(uint8_t *cdb, int cdb_size, unsigned flags, void *sense, int *sense_ | |||
137 | set_scsi_pt_data_in(obj, buffer, *buf_size); | 137 | set_scsi_pt_data_in(obj, buffer, *buf_size); |
138 | if(flags & DO_WRITE) | 138 | if(flags & DO_WRITE) |
139 | set_scsi_pt_data_out(obj, buffer, *buf_size); | 139 | set_scsi_pt_data_out(obj, buffer, *buf_size); |
140 | int ret = do_scsi_pt(obj, g_dev_fd, 1, 0); | 140 | int ret = do_scsi_pt(obj, g_dev_fd, 10, 0); |
141 | switch(get_scsi_pt_result_category(obj)) | 141 | switch(get_scsi_pt_result_category(obj)) |
142 | { | 142 | { |
143 | case SCSI_PT_RESULT_SENSE: | 143 | case SCSI_PT_RESULT_SENSE: |