---
hardware/saleae-logic16/api.c | 40 +++++++++++++++++++---------------------
1 file changed, 19 insertions(+), 21 deletions(-)
diff --git a/hardware/saleae-logic16/api.c b/hardware/saleae-logic16/api.c
index a12143a..c0c4b62 100644
--- a/hardware/saleae-logic16/api.c
+++ b/hardware/saleae-logic16/api.c
@@ -308,6 +308,25 @@ static int logic16_dev_open(struct sr_dev_inst *sdi)
break;
}
+ ret = libusb_claim_interface(usb->devhdl, USB_INTERFACE);
+ if (ret != 0) {
+ switch (ret) {
+ case LIBUSB_ERROR_BUSY:
+ sr_err("Unable to claim USB interface. Another "
+ "program or driver has already claimed
it.");
+ break;
+ case LIBUSB_ERROR_NO_DEVICE:
+ sr_err("Device has been disconnected.");
+ break;
+ default:
+ sr_err("Unable to claim interface: %s.",
+ libusb_error_name(ret));
+ break;
+ }
+
+ return SR_ERR;
+ }
+
if ((ret = logic16_init_device(sdi)) != SR_OK) {
sr_err("Failed to init device.");
break;
@@ -329,13 +348,11 @@ static int logic16_dev_open(struct sr_dev_inst *sdi)
static int dev_open(struct sr_dev_inst *sdi)
{
- struct sr_usb_dev_inst *usb;
struct dev_context *devc;
int ret;
int64_t timediff_us, timediff_ms;
devc = sdi->priv;
- usb = sdi->conn;
/*
* If the firmware was recently uploaded, wait up to MAX_RENUM_DELAY_MS
@@ -371,25 +388,6 @@ static int dev_open(struct sr_dev_inst *sdi)
return SR_ERR;
}
- ret = libusb_claim_interface(usb->devhdl, USB_INTERFACE);
- if (ret != 0) {
- switch (ret) {
- case LIBUSB_ERROR_BUSY:
- sr_err("Unable to claim USB interface. Another "
- "program or driver has already claimed it.");
- break;
- case LIBUSB_ERROR_NO_DEVICE:
- sr_err("Device has been disconnected.");
- break;
- default:
- sr_err("Unable to claim interface: %s.",
- libusb_error_name(ret));
- break;
- }
-
- return SR_ERR;
- }
-
if (devc->cur_samplerate == 0) {
/* Samplerate hasn't been set; default to the slowest one. */
devc->cur_samplerate = samplerates[0];
--
1.8.3.1
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134071&iu=/4140/ostg.clktrk
_______________________________________________
sigrok-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/sigrok-devel
