X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fsaleae-logic-pro%2Fapi.c;h=a5b59e4f61685245cc4c8eeb88be7440978f537e;hb=f1ba6b4b2c9a8ecf90bb31efb218752aa7e49d1a;hp=74bf7ccec57dc839fd09920b70d8a6f2e9d95088;hpb=b6189f7c8af7d8eed6bdcf75fa05c95d8120c9b8;p=libsigrok.git

diff --git a/src/hardware/saleae-logic-pro/api.c b/src/hardware/saleae-logic-pro/api.c
index 74bf7cce..a5b59e4f 100644
--- a/src/hardware/saleae-logic-pro/api.c
+++ b/src/hardware/saleae-logic-pro/api.c
@@ -22,9 +22,9 @@
 #include <string.h>
 #include "protocol.h"
 
-#define BUF_COUNT (8)
-#define BUF_SIZE (16*1024)
-#define BUF_TIMEOUT (1000*1000)
+#define BUF_COUNT 8
+#define BUF_SIZE (16 * 1024)
+#define BUF_TIMEOUT (1000 * 1000)
 
 SR_PRIV struct sr_dev_driver saleae_logic_pro_driver_info;
 
@@ -201,22 +201,16 @@ static int dev_open(struct sr_dev_inst *sdi)
 		return SR_ERR;
 	}
 
-	/* configure default samplerate */
+	/* Configure default samplerate. */
 	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 +253,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;
@@ -289,21 +281,15 @@ static int config_list(uint32_t key, GVariant **data,
 	switch (key) {
 	case SR_CONF_SCAN_OPTIONS:
 		*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-						  scanopts,
-						  ARRAY_SIZE(scanopts),
-						  sizeof(uint32_t));
+			scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
 		break;
 	case SR_CONF_DEVICE_OPTIONS:
 		if (!sdi) {
 			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-							  drvopts,
-							  ARRAY_SIZE(drvopts),
-							  sizeof(uint32_t));
+				drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
 		} else {
 			*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-							  devopts,
-							  ARRAY_SIZE(devopts),
-							  sizeof(uint32_t));
+				devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
 		}
 		break;
 	case SR_CONF_SAMPLERATE:
@@ -335,7 +321,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;
@@ -354,9 +340,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;
@@ -375,8 +358,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 		buf = g_malloc(BUF_SIZE);
 		transfer = libusb_alloc_transfer(0);
 		libusb_fill_bulk_transfer(transfer, usb->devhdl,
-					  2 | LIBUSB_ENDPOINT_IN, buf, BUF_SIZE,
-					  saleae_logic_pro_receive_data, (void *)sdi, BUF_TIMEOUT);
+			2 | LIBUSB_ENDPOINT_IN, buf, BUF_SIZE,
+			saleae_logic_pro_receive_data, (void *)sdi, BUF_TIMEOUT);
 		if ((ret = libusb_submit_transfer(transfer)) != 0) {
 			sr_err("Failed to submit transfer: %s.",
 			       libusb_error_name(ret));
@@ -405,9 +388,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);