From 81d63d246c6d48c179f74efab91d45d053d59a6c Mon Sep 17 00:00:00 2001 From: Bernd Porr Date: Tue, 17 Nov 2009 23:18:49 +0000 Subject: [PATCH] I've set all timeout values to 1000ms. Some bulk transfers used 30ms as a timeout which should be OK but it's just a bit short. Nothing detrimental. --- comedi/drivers/usbduxfast.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/comedi/drivers/usbduxfast.c b/comedi/drivers/usbduxfast.c index 9115e6e1..bc42c9db 100644 --- a/comedi/drivers/usbduxfast.c +++ b/comedi/drivers/usbduxfast.c @@ -70,7 +70,7 @@ Status: stable #define BOARDNAME "usbduxfast" // timeout for the USB-transfer -#define EZTIMEOUT 30 +#define BULK_TIMEOUT 1000 // constants for "firmware" upload and download #define USBDUXFASTSUB_FIRMWARE 0xA0 @@ -210,7 +210,7 @@ static int send_dux_commands(usbduxfastsub_t * this_usbduxfastsub, int cmd_type) usb_sndbulkpipe(this_usbduxfastsub->usbdev, CHANNELLISTEP), this_usbduxfastsub->dux_commands, - SIZEOFDUXBUFFER, &nsent, 10000); + SIZEOFDUXBUFFER, &nsent, BULK_TIMEOUT); if (result < 0) { printk("comedi%d: could not transmit dux_commands to the usb-device, err=%d\n", this_usbduxfastsub->comedidev->minor, result); } @@ -446,7 +446,7 @@ static int usbduxfastsub_start(usbduxfastsub_t * usbduxfastsub) // Length 1, // Timeout - EZTIMEOUT); + BULK_TIMEOUT); if (errcode < 0) { printk("comedi_: usbduxfast_: control msg failed (start)\n"); return errcode; @@ -475,7 +475,7 @@ static int usbduxfastsub_stop(usbduxfastsub_t * usbduxfastsub) // Length 1, // Timeout - EZTIMEOUT); + BULK_TIMEOUT); if (errcode < 0) { printk("comedi_: usbduxfast: control msg failed (stop)\n"); return errcode; @@ -505,7 +505,7 @@ static int usbduxfastsub_upload(usbduxfastsub_t * usbduxfastsub, // length len, // timeout - EZTIMEOUT); + BULK_TIMEOUT); if (errcode < 0) { printk("comedi_: usbduxfast: uppload failed\n"); return errcode; @@ -1227,7 +1227,7 @@ static int usbduxfast_ai_insn_read(comedi_device * dev, err = USB_BULK_MSG(usbduxfastsub->usbdev, usb_rcvbulkpipe(usbduxfastsub->usbdev, BULKINEP), usbduxfastsub->transfer_buffer, - SIZEINBUF, &actual_length, 10000); + SIZEINBUF, &actual_length, BULK_TIMEOUT); if (err < 0) { printk("comedi%d: insn timeout. No data.\n", dev->minor); @@ -1240,7 +1240,7 @@ static int usbduxfast_ai_insn_read(comedi_device * dev, err = USB_BULK_MSG(usbduxfastsub->usbdev, usb_rcvbulkpipe(usbduxfastsub->usbdev, BULKINEP), usbduxfastsub->transfer_buffer, - SIZEINBUF, &actual_length, 10000); + SIZEINBUF, &actual_length, BULK_TIMEOUT); if (err < 0) { printk("comedi%d: insn data error: %d\n", dev->minor, err); -- 2.26.2