#include <stdlib.h>
#include <string.h>
#include <libsigrok/libsigrok.h>
-#include "libsigrok-internal.h"
+#include <libsigrok-internal.h>
#include "protocol.h"
/* Supported device scan options.
return std_dev_clear(di, &clear_dev_context);
}
+/* Drain any pending data from the USB transfer buffers on the device.
+ * This may be necessary e.g. after a crash or generally to clean up after
+ * an abnormal condition.
+ */
+static int drain_usb(struct sr_usb_dev_inst *usb, unsigned int endpoint)
+{
+ int drained, xfer_len;
+ int ret;
+ unsigned char buf[512];
+
+ const unsigned int drain_timeout_ms = 10;
+
+ drained = 0;
+ do {
+ xfer_len = 0;
+ ret = libusb_bulk_transfer(usb->devhdl, endpoint,
+ buf, sizeof(buf), &xfer_len,
+ drain_timeout_ms);
+ drained += xfer_len;
+ } while (ret == LIBUSB_SUCCESS && xfer_len != 0);
+
+ if (ret != LIBUSB_SUCCESS && ret != LIBUSB_ERROR_TIMEOUT) {
+ sr_err("Failed to drain USB endpoint %u: %s.",
+ endpoint & (LIBUSB_ENDPOINT_IN - 1),
+ libusb_error_name(ret));
+ return SR_ERR;
+ }
+ if (drained > 0) {
+ sr_warn("Drained %d bytes from USB endpoint %u.",
+ drained, endpoint & (LIBUSB_ENDPOINT_IN - 1));
+ }
+ return SR_OK;
+}
+
/* Open and initialize device.
*/
static int dev_open(struct sr_dev_inst *sdi)
struct drv_context *drvc;
struct dev_context *devc;
struct sr_usb_dev_inst *usb;
+ int i;
int ret;
drvc = sdi->driver->context;
return SR_ERR;
}
- ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, usb);
- if (ret != SR_OK)
- return ret;
+ /* Try the whole shebang three times, fingers crossed. */
+ for (i = 0; i < 3; i++) {
+ ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, usb);
+ if (ret != SR_OK)
+ return ret;
- /* Set the configuration twice to trigger a lightweight reset.
- */
- ret = libusb_set_configuration(usb->devhdl, USB_CONFIG);
- if (ret == 0)
ret = libusb_set_configuration(usb->devhdl, USB_CONFIG);
- if (ret != 0) {
- sr_err("Failed to set USB configuration: %s.",
- libusb_error_name(ret));
- sr_usb_close(usb);
- return SR_ERR;
- }
+ if (ret != LIBUSB_SUCCESS) {
+ sr_err("Failed to set USB configuration: %s.",
+ libusb_error_name(ret));
+ sr_usb_close(usb);
+ return SR_ERR;
+ }
- ret = libusb_claim_interface(usb->devhdl, USB_INTERFACE);
- if (ret < 0) {
- sr_err("Failed to claim interface: %s.",
- libusb_error_name(ret));
- sr_usb_close(usb);
- return SR_ERR;
- }
+ ret = libusb_claim_interface(usb->devhdl, USB_INTERFACE);
+ if (ret != LIBUSB_SUCCESS) {
+ sr_err("Failed to claim interface: %s.",
+ libusb_error_name(ret));
+ sr_usb_close(usb);
+ return SR_ERR;
+ }
- sdi->status = SR_ST_ACTIVE;
+ ret = drain_usb(usb, EP_REPLY);
+ if (ret != SR_OK) {
+ sr_usb_close(usb);
+ return ret;
+ }
+ /* This delay appears to be necessary for reliable operation. */
+ g_usleep(30 * 1000);
- devc->active_fpga_config = FPGA_NOCONF;
- devc->state = STATE_IDLE;
+ sdi->status = SR_ST_ACTIVE;
- ret = (*devc->model->apply_fpga_config)(sdi);
+ devc->active_fpga_config = FPGA_NOCONF;
+ devc->short_transfer_quirk = FALSE;
+ devc->state = STATE_IDLE;
- if (ret == SR_OK)
- ret = (*devc->model->device_init_check)(sdi);
+ ret = (*devc->model->apply_fpga_config)(sdi);
- if (ret != SR_OK) {
+ if (ret == SR_OK)
+ ret = (*devc->model->device_init_check)(sdi);
+ if (ret == SR_OK)
+ break;
+
+ /* Rinse and repeat. */
sdi->status = SR_ST_INACTIVE;
sr_usb_close(usb);
}
+
+ if (ret == SR_OK && devc->short_transfer_quirk)
+ sr_warn("Short transfer quirk detected! "
+ "Memory reads will be slow.");
return ret;
}
uint64_t trigger_mask;
uint64_t trigger_values;
uint64_t trigger_edge_mask;
- uint64_t channel_bit;
+ uint64_t level_bit, type_bit;
struct dev_context *devc;
struct sr_trigger *trigger;
struct sr_trigger_stage *stage;
struct sr_trigger_match *match;
const GSList *node;
int idx;
+ enum sr_trigger_matches trg;
devc = sdi->priv;
continue; /* ignore disabled channel */
idx = match->channel->index;
+ trg = match->match;
if (idx < 0 || idx >= devc->model->num_channels) {
sr_err("Channel index %d out of range.", idx);
return SR_ERR_BUG; /* should not happen */
}
- channel_bit = UINT64_C(1) << idx;
- trigger_mask |= channel_bit;
-
- switch (match->match) {
- case SR_TRIGGER_ZERO:
- break;
- case SR_TRIGGER_ONE:
- trigger_values |= channel_bit;
- break;
- case SR_TRIGGER_RISING:
- trigger_values |= channel_bit;
- /* Fall through for edge mask. */
- case SR_TRIGGER_FALLING:
- trigger_edge_mask |= channel_bit;
- break;
- default:
+ if (trg != SR_TRIGGER_ZERO
+ && trg != SR_TRIGGER_ONE
+ && trg != SR_TRIGGER_RISING
+ && trg != SR_TRIGGER_FALLING) {
sr_err("Unsupported trigger match for CH%d.", idx + 1);
return SR_ERR_ARG;
}
+ level_bit = (trg == SR_TRIGGER_ONE
+ || trg == SR_TRIGGER_RISING) ? 1 : 0;
+ type_bit = (trg == SR_TRIGGER_RISING
+ || trg == SR_TRIGGER_FALLING) ? 1 : 0;
+
+ trigger_mask |= UINT64_C(1) << idx;
+ trigger_values |= level_bit << idx;
+ trigger_edge_mask |= type_bit << idx;
}
devc->trigger_mask = trigger_mask;
devc->trigger_values = trigger_values;
projects / libsigrok.git / blobdiff