X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fgmc-mh-1x-2x%2Fapi.c;h=2b7bfca6c6ebead378b8babaeca3a4f29a434783;hb=695dc859c15ba4190f5c1aa2e1a6e2dc6a6e5845;hp=baa75738b89d0140382970e9bcdfbe768d9d807e;hpb=1a46cc62e2b528bcaeb1f8dc0c952a81b3bcba5c;p=libsigrok.git

diff --git a/src/hardware/gmc-mh-1x-2x/api.c b/src/hardware/gmc-mh-1x-2x/api.c
index baa75738..2b7bfca6 100644
--- a/src/hardware/gmc-mh-1x-2x/api.c
+++ b/src/hardware/gmc-mh-1x-2x/api.c
@@ -22,6 +22,7 @@
  *  @internal
  */
 
+#include <config.h>
 #include <string.h>
 #include "protocol.h"
 
@@ -161,10 +162,9 @@ static GSList *scan_1x_2x_rs232(struct sr_dev_driver *di, GSList *options)
 	gboolean serialcomm_given;
 
 	devices = NULL;
-	drvc = di->priv;
+	drvc = di->context;
 	drvc->instances = NULL;
 	conn = serialcomm = NULL;
-	model = METRAHIT_NONE;
 	serialcomm_given = FALSE;
 
 	sr_spew("scan_1x_2x_rs232() called!");
@@ -256,7 +256,7 @@ static GSList *scan_2x_bd232(struct sr_dev_driver *di, GSList *options)
 	conn = serialcomm = NULL;
 	devices = NULL;
 
-	drvc = di->priv;
+	drvc = di->context;
 	drvc->instances = NULL;
 
 	sr_spew("scan_2x_bd232() called!");
@@ -301,13 +301,13 @@ static GSList *scan_2x_bd232(struct sr_dev_driver *di, GSList *options)
 	while (timeout_us > g_get_monotonic_time()) {
 		/* Receive reply (14 bytes) */
 		devc->buflen = 0;
-		for (cnt = 0; cnt < 14; cnt++) {
+		for (cnt = 0; cnt < GMC_REPLY_SIZE; cnt++) {
 			byte = read_byte(serial, timeout_us);
 			if (byte != -1)
 				devc->buf[devc->buflen++] = (byte & MASK_6BITS);
 		}
 
-		if (devc->buflen != 14)
+		if (devc->buflen != GMC_REPLY_SIZE)
 			continue;
 
 		devc->addr = devc->buf[0];
@@ -345,8 +345,7 @@ exit_err:
 
 	if (serial)
 		sr_serial_dev_inst_free(serial);
-	if (devc)
-		g_free(devc);
+	g_free(devc);
 	if (sdi)
 		sr_dev_inst_free(sdi);
 
@@ -355,7 +354,7 @@ exit_err:
 
 static GSList *dev_list(const struct sr_dev_driver *di)
 {
-	return ((struct drv_context *)(di->priv))->instances;
+	return ((struct drv_context *)(di->context))->instances;
 }
 
 static int dev_close(struct sr_dev_inst *sdi)
@@ -461,24 +460,19 @@ static int config_list_bd(uint32_t key, GVariant **data, const struct sr_dev_ins
 	return SR_OK;
 }
 
-static int dev_acquisition_start_1x_2x_rs232(const struct sr_dev_inst *sdi,
-					     void *cb_data)
+static int dev_acquisition_start_1x_2x_rs232(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 	struct sr_serial_dev_inst *serial;
 
-	if (!sdi || !cb_data || !(devc = sdi->priv))
-		return SR_ERR_BUG;
-
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
-	devc->cb_data = cb_data;
+	devc = sdi->priv;
 	devc->settings_ok = FALSE;
 	devc->buflen = 0;
 
-	/* Send header packet to the session bus. */
-	std_session_send_df_header(cb_data, LOG_PREFIX);
+	std_session_send_df_header(sdi, LOG_PREFIX);
 
 	/* Start timer, if required. */
 	if (devc->limit_msec)
@@ -492,24 +486,19 @@ static int dev_acquisition_start_1x_2x_rs232(const struct sr_dev_inst *sdi,
 	return SR_OK;
 }
 
-static int dev_acquisition_start_2x_bd232(const struct sr_dev_inst *sdi,
-					  void *cb_data)
+static int dev_acquisition_start_2x_bd232(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 	struct sr_serial_dev_inst *serial;
 
-	if (!sdi || !cb_data || !(devc = sdi->priv))
-		return SR_ERR_BUG;
-
 	if (sdi->status != SR_ST_ACTIVE)
 		return SR_ERR_DEV_CLOSED;
 
-	devc->cb_data = cb_data;
+	devc = sdi->priv;
 	devc->settings_ok = FALSE;
 	devc->buflen = 0;
 
-	/* Send header packet to the session bus. */
-	std_session_send_df_header(cb_data, LOG_PREFIX);
+	std_session_send_df_header(sdi, LOG_PREFIX);
 
 	/* Start timer, if required. */
 	if (devc->limit_msec)
@@ -524,7 +513,7 @@ static int dev_acquisition_start_2x_bd232(const struct sr_dev_inst *sdi,
 	return req_meas14(sdi);
 }
 
-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;
 
@@ -532,7 +521,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 	if (sdi && (devc = sdi->priv) && devc->limit_msec)
 		g_timer_stop(devc->elapsed_msec);
 
-	return std_serial_dev_acquisition_stop(sdi, cb_data, dev_close,
+	return std_serial_dev_acquisition_stop(sdi, sdi, dev_close,
 			sdi->conn, LOG_PREFIX);
 }
 
@@ -552,7 +541,7 @@ SR_PRIV struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info = {
 	.dev_close = dev_close,
 	.dev_acquisition_start = dev_acquisition_start_1x_2x_rs232,
 	.dev_acquisition_stop = dev_acquisition_stop,
-	.priv = NULL,
+	.context = NULL,
 };
 
 SR_PRIV struct sr_dev_driver gmc_mh_2x_bd232_driver_info = {
@@ -571,5 +560,5 @@ SR_PRIV struct sr_dev_driver gmc_mh_2x_bd232_driver_info = {
 	.dev_close = dev_close,
 	.dev_acquisition_start = dev_acquisition_start_2x_bd232,
 	.dev_acquisition_stop = dev_acquisition_stop,
-	.priv = NULL,
+	.context = NULL,
 };