X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fzeroplus-logic-cube%2Fapi.c;h=ca3d5ad2f8403c231c3a1b4c76c1702bc80488f5;hb=208c1d35435626a11afa1ab301b2071b2a4e187b;hp=50b7df9e423ece744797a9af375bf7af8403a9f3;hpb=2a8f2d41adcd0aa9e498c4eea2a5f82263039e5c;p=libsigrok.git

diff --git a/src/hardware/zeroplus-logic-cube/api.c b/src/hardware/zeroplus-logic-cube/api.c
index 50b7df9e..ca3d5ad2 100644
--- a/src/hardware/zeroplus-logic-cube/api.c
+++ b/src/hardware/zeroplus-logic-cube/api.c
@@ -31,7 +31,7 @@
 struct zp_model {
 	uint16_t vid;
 	uint16_t pid;
-	char *model_name;
+	const char *model_name;
 	unsigned int channels;
 	unsigned int sample_depth;	/* In Ksamples/channel */
 	unsigned int max_sampling_freq;
@@ -51,7 +51,7 @@ static const struct zp_model zeroplus_models[] = {
 	{0x0c12, 0x700e, "LAP-C(16032)",  16, 32,   100},
 	{0x0c12, 0x7016, "LAP-C(162000)", 16, 2048, 200},
 	{0x0c12, 0x7100, "AKIP-9101", 16, 256, 200},
-	{ 0, 0, 0, 0, 0, 0 }
+	ALL_ZERO
 };
 
 static const uint32_t devopts[] = {
@@ -512,8 +512,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, void *cb_data)
 {
 	struct dev_context *devc;
 	struct sr_usb_dev_inst *usb;
@@ -538,10 +537,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,13 +574,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);
 
 	/* Check for empty capture */
 	if ((status & STATUS_READY) && !stop_address) {
-		packet.type = SR_DF_END;
-		sr_session_send(cb_data, &packet);
+		std_session_send_df_end(cb_data, LOG_PREFIX);
 		return SR_OK;
 	}
 
@@ -692,8 +686,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 	analyzer_read_stop(usb->devhdl);
 	g_free(buf);
 
-	packet.type = SR_DF_END;
-	sr_session_send(cb_data, &packet);
+	std_session_send_df_end(cb_data, LOG_PREFIX);
 
 	return SR_OK;
 }
@@ -703,10 +696,8 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
 	struct dev_context *devc;
 	struct sr_usb_dev_inst *usb;
-	struct sr_datafeed_packet packet;
 
-	packet.type = SR_DF_END;
-	sr_session_send(cb_data, &packet);
+	std_session_send_df_end(cb_data, LOG_PREFIX);
 
 	if (!(devc = sdi->priv)) {
 		sr_err("%s: sdi->priv was NULL", __func__);