X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fzeroplus-logic-cube%2Fapi.c;h=1081b81c2b461ec4cf059a9f8f0dc8c6df80dfd5;hb=8aafc5e64d60ef5e91992707a8f4dbce03e901a0;hp=3681352e73e058828ec03e4cb7b800b80e554eef;hpb=3be42bc22f8b36599a448273c12a76d3e0f7a940;p=libsigrok.git

diff --git a/src/hardware/zeroplus-logic-cube/api.c b/src/hardware/zeroplus-logic-cube/api.c
index 3681352e..1081b81c 100644
--- a/src/hardware/zeroplus-logic-cube/api.c
+++ b/src/hardware/zeroplus-logic-cube/api.c
@@ -256,11 +256,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	return devices;
 }
 
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
-	return ((struct drv_context *)(di->context))->instances;
-}
-
 static int dev_open(struct sr_dev_inst *sdi)
 {
 	struct sr_dev_driver *di = sdi->driver;
@@ -273,11 +268,7 @@ static int dev_open(struct sr_dev_inst *sdi)
 
 	drvc = di->context;
 	usb = sdi->conn;
-
-	if (!(devc = sdi->priv)) {
-		sr_err("%s: sdi->priv was NULL", __func__);
-		return SR_ERR_ARG;
-	}
+	devc = sdi->priv;
 
 	device_count = libusb_get_device_list(drvc->sr_ctx->libusb_ctx,
 					      &devlist);
@@ -377,11 +368,6 @@ static int dev_close(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-static int cleanup(const struct sr_dev_driver *di)
-{
-	return std_dev_clear(di, NULL);
-}
-
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
 		const struct sr_channel_group *cg)
 {
@@ -512,8 +498,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 	return SR_OK;
 }
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi,
-		void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 	struct sr_usb_dev_inst *usb;
@@ -538,10 +523,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
-	if (!(devc = sdi->priv)) {
-		sr_err("%s: sdi->priv was NULL", __func__);
-		return SR_ERR_ARG;
-	}
+	devc = sdi->priv;
 
 	if (analyzer_add_triggers(sdi) != SR_OK) {
 		sr_err("Failed to configure triggers.");
@@ -578,12 +560,11 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 	sr_info("Ramsize trigger    = 0x%x.", ramsize_trigger);
 	sr_info("Memory size        = 0x%x.", memory_size);
 
-	/* Send header packet to the session bus. */
-	std_session_send_df_header(cb_data, LOG_PREFIX);
+	std_session_send_df_header(sdi, LOG_PREFIX);
 
 	/* Check for empty capture */
 	if ((status & STATUS_READY) && !stop_address) {
-		std_session_send_df_end(cb_data, LOG_PREFIX);
+		std_session_send_df_end(sdi, LOG_PREFIX);
 		return SR_OK;
 	}
 
@@ -666,7 +647,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 			logic.length = (trigger_offset - samples_read) * 4;
 			logic.unitsize = 4;
 			logic.data = buf + buf_offset;
-			sr_session_send(cb_data, &packet);
+			sr_session_send(sdi, &packet);
 			len -= logic.length;
 			samples_read += logic.length / 4;
 			buf_offset += logic.length;
@@ -676,7 +657,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 			/* Send out trigger */
 			packet.type = SR_DF_TRIGGER;
 			packet.payload = NULL;
-			sr_session_send(cb_data, &packet);
+			sr_session_send(sdi, &packet);
 		}
 
 		/* Send out data (or data after trigger) */
@@ -685,29 +666,23 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 		logic.length = len;
 		logic.unitsize = 4;
 		logic.data = buf + buf_offset;
-		sr_session_send(cb_data, &packet);
+		sr_session_send(sdi, &packet);
 		samples_read += len / 4;
 	}
 	analyzer_read_stop(usb->devhdl);
 	g_free(buf);
 
-	std_session_send_df_end(cb_data, LOG_PREFIX);
+	std_session_send_df_end(sdi, LOG_PREFIX);
 
 	return SR_OK;
 }
 
 /* TODO: This stops acquisition on ALL devices, ignoring dev_index. */
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	struct dev_context *devc;
 	struct sr_usb_dev_inst *usb;
 
-	std_session_send_df_end(cb_data, LOG_PREFIX);
-
-	if (!(devc = sdi->priv)) {
-		sr_err("%s: sdi->priv was NULL", __func__);
-		return SR_ERR_BUG;
-	}
+	std_session_send_df_end(sdi, LOG_PREFIX);
 
 	usb = sdi->conn;
 	analyzer_reset(usb->devhdl);
@@ -721,9 +696,9 @@ SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info = {
 	.longname = "ZEROPLUS Logic Cube LAP-C series",
 	.api_version = 1,
 	.init = init,
-	.cleanup = cleanup,
+	.cleanup = std_cleanup,
 	.scan = scan,
-	.dev_list = dev_list,
+	.dev_list = std_dev_list,
 	.dev_clear = NULL,
 	.config_get = config_get,
 	.config_set = config_set,