X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fsysclk-lwla%2Fapi.c;h=154d4f9000ee6247fb583f78eee49b93e0febbb5;hb=e57057aee778e723da572a6b5e2bd01526cc7beb;hp=928bab75bf58d9a5b8aa513633bf000f066c1956;hpb=225d3cb0c52fc3df5b26fec94d3b3d2de796a41c;p=libsigrok.git

diff --git a/src/hardware/sysclk-lwla/api.c b/src/hardware/sysclk-lwla/api.c
index 928bab75..154d4f90 100644
--- a/src/hardware/sysclk-lwla/api.c
+++ b/src/hardware/sysclk-lwla/api.c
@@ -193,55 +193,76 @@ static int dev_open(struct sr_dev_inst *sdi)
 		sr_err("Driver was not initialized.");
 		return SR_ERR;
 	}
-
+	if (sdi->status != SR_ST_INACTIVE) {
+		sr_err("Device already open.");
+		return SR_ERR;
+	}
 	usb = sdi->conn;
 
 	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;
+	}
+
 	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;
 	}
-
-	sdi->status = SR_ST_INITIALIZING;
+	sdi->status = SR_ST_ACTIVE;
 
 	ret = lwla_init_device(sdi);
-
-	if (ret == SR_OK)
-		sdi->status = SR_ST_ACTIVE;
-
+	if (ret != SR_OK) {
+		sr_usb_close(usb);
+		sdi->status = SR_ST_INACTIVE;
+	}
 	return ret;
 }
 
 static int dev_close(struct sr_dev_inst *sdi)
 {
 	struct sr_usb_dev_inst *usb;
+	struct dev_context *devc;
+	int ret;
 
 	if (!di->context) {
 		sr_err("Driver was not initialized.");
 		return SR_ERR;
 	}
-
 	usb = sdi->conn;
-	if (!usb->devhdl)
+	devc = sdi->priv;
+
+	if (sdi->status == SR_ST_INACTIVE)
 		return SR_OK;
 
+	if (devc && devc->acquisition) {
+		sr_err("Attempt to close device during acquisition.");
+		return SR_ERR;
+	}
 	sdi->status = SR_ST_INACTIVE;
 
 	/* Trigger download of the shutdown bitstream. */
-	if (lwla_set_clock_config(sdi) != SR_OK)
+	ret = lwla_set_clock_config(sdi);
+	if (ret != SR_OK)
 		sr_err("Unable to shut down device.");
 
 	libusb_release_interface(usb->devhdl, USB_INTERFACE);
-	libusb_close(usb->devhdl);
-
-	usb->devhdl = NULL;
+	sr_usb_close(usb);
 
-	return SR_OK;
+	return ret;
 }
 
 static int cleanup(const struct sr_dev_driver *di)
@@ -565,6 +586,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	if (!acq)
 		return SR_ERR_MALLOC;
 
+	devc->cancel_requested = FALSE;
 	devc->stopping_in_progress = FALSE;
 	devc->transfer_error = FALSE;
 
@@ -599,15 +621,18 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
+	struct dev_context *devc;
+
 	(void)cb_data;
+	devc = sdi->priv;
 
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
-	sr_dbg("Stopping acquisition.");
-
-	sdi->status = SR_ST_STOPPING;
-
+	if (devc->acquisition && !devc->cancel_requested) {
+		devc->cancel_requested = TRUE;
+		sr_dbg("Stopping acquisition.");
+	}
 	return SR_OK;
 }