X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fzeroplus-logic-cube%2Fapi.c;h=f9f2ba795d6bd4185e834a226d7f98f0c156b8bc;hb=88a0265ebcb265ba839c02cc5bcd39e359c9f60f;hp=ab4c3cc4eb99525f4d9155895fe6e9beb9cd9d20;hpb=1c47e0da8f2571bc34dbdc368c3c1f55318c3aa0;p=libsigrok.git

diff --git a/src/hardware/zeroplus-logic-cube/api.c b/src/hardware/zeroplus-logic-cube/api.c
index ab4c3cc4..f9f2ba79 100644
--- a/src/hardware/zeroplus-logic-cube/api.c
+++ b/src/hardware/zeroplus-logic-cube/api.c
@@ -273,11 +273,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 +373,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 +503,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 +528,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,11 +565,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);
 
-	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;
 	}
 
@@ -665,7 +652,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;
@@ -675,7 +662,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) */
@@ -684,29 +671,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);
@@ -720,7 +701,7 @@ 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_clear = NULL,