X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Flascar-el-usb%2Fapi.c;h=9801732a8e70ce1211757abf7030dc9eb029f6f8;hb=f1ba6b4b2c9a8ecf90bb31efb218752aa7e49d1a;hp=32bb958bce913a6c1a8f36cc3c56bd13547deb52;hpb=15a5bfe4815f9991a9bb532c05d6244a1818a0e4;p=libsigrok.git

diff --git a/src/hardware/lascar-el-usb/api.c b/src/hardware/lascar-el-usb/api.c
index 32bb958b..9801732a 100644
--- a/src/hardware/lascar-el-usb/api.c
+++ b/src/hardware/lascar-el-usb/api.c
@@ -97,9 +97,8 @@ static int dev_open(struct sr_dev_inst *sdi)
 		sr_err("Failed to claim interface: %s.", libusb_error_name(ret));
 		return SR_ERR;
 	}
-	sdi->status = SR_ST_ACTIVE;
 
-	return ret;
+	return SR_OK;
 }
 
 static int dev_close(struct sr_dev_inst *sdi)
@@ -109,13 +108,11 @@ static int dev_close(struct sr_dev_inst *sdi)
 	usb = sdi->conn;
 
 	if (!usb->devhdl)
-		/*  Nothing to do. */
-		return SR_OK;
+		return SR_ERR_BUG;
 
 	libusb_release_interface(usb->devhdl, LASCAR_INTERFACE);
 	libusb_close(usb->devhdl);
 	usb->devhdl = NULL;
-	sdi->status = SR_ST_INACTIVE;
 
 	return SR_OK;
 }
@@ -164,9 +161,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 
 	(void)cg;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	devc = sdi->priv;
 	ret = SR_OK;
 	switch (key) {
@@ -293,9 +287,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	int ret;
 	unsigned char cmd[3], resp[4], *buf;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	drvc = di->context;
 	devc = sdi->priv;
 	usb = sdi->conn;
@@ -305,7 +296,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 	sr_dbg("Starting log retrieval.");
 
-	std_session_send_df_header(sdi, LOG_PREFIX);
+	std_session_send_df_header(sdi);
 
 	interval = (devc->config[0x1c] | (devc->config[0x1d] << 8)) * 1000;
 	packet.type = SR_DF_META;
@@ -317,7 +308,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 	if (devc->logged_samples == 0) {
 		/* This ensures the frontend knows the session is done. */
-		std_session_send_df_end(sdi, LOG_PREFIX);
+		std_session_send_df_end(sdi);
 		return SR_OK;
 	}
 
@@ -395,13 +386,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-SR_PRIV int dev_acquisition_stop(struct sr_dev_inst *sdi)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	if (sdi->status != SR_ST_ACTIVE) {
-		sr_err("Device inactive, can't stop acquisition.");
-		return SR_ERR;
-	}
-
 	sdi->status = SR_ST_STOPPING;
 	/* TODO: free ongoing transfers? */