summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2014-02-22 20:27:32 +0100
committerAmaury Pouly <amaury.pouly@gmail.com>2014-02-22 20:27:32 +0100
commitc02bc1afd2a2400a41a863918bfe4eaf0255d60d (patch)
treea116567deb994e36c5259ce86df3e3fbaa327557
parentaae249c206555f1481348248352471f8e4cc5ae5 (diff)
downloadrockbox-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.c1
-rw-r--r--utils/imxtools/scsitools/scsitool.c2
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 @@
#include "rtc-imx233.h"
#include "pcm_sampr.h"
#include "audio-target.h"
+#include "power-imx233.h"
#ifndef IMX233_AUDIO_COUPLING_MODE
#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_
set_scsi_pt_data_in(obj, buffer, *buf_size);
if(flags & DO_WRITE)
set_scsi_pt_data_out(obj, buffer, *buf_size);
- int ret = do_scsi_pt(obj, g_dev_fd, 1, 0);
+ int ret = do_scsi_pt(obj, g_dev_fd, 10, 0);
switch(get_scsi_pt_result_category(obj))
{
case SCSI_PT_RESULT_SENSE: