X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fsaleae-logic-pro%2Fapi.c;h=ef4f49500fa8cb9738ac5d540bc7311ebc026f56;hb=f778bf02eaf0d7fa7ccb91a0da8a68233f1fb79a;hp=74e3bbacc44b2fbfadcd8b45bfc5f0f4597b779b;hpb=bb0c52719e43d4f81b63dbeea906ff89183cde21;p=libsigrok.git

diff --git a/src/hardware/saleae-logic-pro/api.c b/src/hardware/saleae-logic-pro/api.c
index 74e3bbac..ef4f4950 100644
--- a/src/hardware/saleae-logic-pro/api.c
+++ b/src/hardware/saleae-logic-pro/api.c
@@ -180,11 +180,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	return std_scan_complete(di, devices);
 }
 
-static int dev_clear(const struct sr_dev_driver *di)
-{
-	return std_dev_clear(di, NULL);
-}
-
 static int dev_open(struct sr_dev_inst *sdi)
 {
 	struct sr_dev_driver *di = sdi->driver;
@@ -205,18 +200,12 @@ static int dev_open(struct sr_dev_inst *sdi)
 	if (devc->dig_samplerate == 0)
 		devc->dig_samplerate = samplerates[3];
 
-	sdi->status = SR_ST_ACTIVE;
-
 	return SR_OK;
 }
 
 static int dev_close(struct sr_dev_inst *sdi)
 {
-	struct sr_usb_dev_inst *usb = sdi->conn;
-
-	sr_usb_close(usb);
-
-	sdi->status = SR_ST_INACTIVE;
+	sr_usb_close(sdi->conn);
 
 	return SR_OK;
 }
@@ -259,8 +248,6 @@ static int config_set(uint32_t key, GVariant *data,
 
 	(void)cg;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
 	devc = sdi->priv;
 
 	ret = SR_OK;
@@ -329,7 +316,7 @@ static int dev_acquisition_handle(int fd, int revents, void *cb_data)
 {
 	struct sr_dev_inst *sdi = cb_data;
 	struct drv_context *drvc = sdi->driver->context;
-	struct timeval tv = {};
+	struct timeval tv = ALL_ZERO;
 
 	(void)fd;
 	(void)revents;
@@ -348,9 +335,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	uint8_t *buf;
 	unsigned int i, ret;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	ret = saleae_logic_pro_init(sdi);
 	if (ret != SR_OK)
 		return ret;
@@ -399,9 +383,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 	struct dev_context *devc = sdi->priv;
 	struct drv_context *drvc = sdi->driver->context;
 
-	if (sdi->status != SR_ST_ACTIVE)
-		return SR_ERR_DEV_CLOSED;
-
 	saleae_logic_pro_stop(sdi);
 
 	std_session_send_df_end(sdi);
@@ -421,7 +402,7 @@ SR_PRIV struct sr_dev_driver saleae_logic_pro_driver_info = {
 	.cleanup = std_cleanup,
 	.scan = scan,
 	.dev_list = std_dev_list,
-	.dev_clear = dev_clear,
+	.dev_clear = std_dev_clear,
 	.config_get = config_get,
 	.config_set = config_set,
 	.config_list = config_list,