From 7ce737a77c0d29276cdda4f3670c1ef41173bb9c Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sun, 24 Jun 2012 16:45:08 +0200 Subject: [PATCH] sr: fx2lafw: Handle the transfer's status While errors are usually already implicitly caught by looking at the packet length field there is one error status which is worth special handling. If the device has been removed there is not really a chance to recover from this error so data acquisition can be stopped immediately. Signed-off-by: Lars-Peter Clausen --- hardware/fx2lafw/fx2lafw.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c index c03c6b87..fce5472b 100644 --- a/hardware/fx2lafw/fx2lafw.c +++ b/hardware/fx2lafw/fx2lafw.c @@ -724,6 +724,7 @@ static void receive_transfer(struct libusb_transfer *transfer) { /* TODO: These statics have to move to the ctx struct. */ static int empty_transfer_count = 0; + gboolean packet_has_error = FALSE; struct sr_datafeed_packet packet; struct sr_datafeed_logic logic; struct context *ctx = transfer->user_data; @@ -746,7 +747,20 @@ static void receive_transfer(struct libusb_transfer *transfer) const int sample_width = ctx->sample_wide ? 2 : 1; const int cur_sample_count = transfer->actual_length / sample_width; - if (transfer->actual_length == 0) { + switch (transfer->status) { + case LIBUSB_TRANSFER_NO_DEVICE: + abort_acquisition(ctx); + free_transfer(transfer); + return; + case LIBUSB_TRANSFER_COMPLETED: + case LIBUSB_TRANSFER_TIMED_OUT: /* We may have received some data though */ + break; + default: + packet_has_error = TRUE; + break; + } + + if (transfer->actual_length == 0 || packet_has_error) { empty_transfer_count++; if (empty_transfer_count > MAX_EMPTY_TRANSFERS) { /*