X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fgmc-mh-1x-2x%2Fapi.c;h=15bf7f9f4845021adcea0bb6d4578ff172fb5fe2;hb=6525d819eef098a43b1f438ae4af50e67c9c4335;hp=d4e44b2512b93da5c72e5b240abc2dfc5b8cc224;hpb=208c1d35435626a11afa1ab301b2071b2a4e187b;p=libsigrok.git

diff --git a/src/hardware/gmc-mh-1x-2x/api.c b/src/hardware/gmc-mh-1x-2x/api.c
index d4e44b25..15bf7f9f 100644
--- a/src/hardware/gmc-mh-1x-2x/api.c
+++ b/src/hardware/gmc-mh-1x-2x/api.c
@@ -460,8 +460,7 @@ 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;
@@ -470,11 +469,10 @@ static int dev_acquisition_start_1x_2x_rs232(const struct sr_dev_inst *sdi,
 		return SR_ERR_DEV_CLOSED;
 
 	devc = sdi->priv;
-	devc->cb_data = cb_data;
 	devc->settings_ok = FALSE;
 	devc->buflen = 0;
 
-	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)
@@ -488,8 +486,7 @@ 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;
@@ -498,11 +495,10 @@ static int dev_acquisition_start_2x_bd232(const struct sr_dev_inst *sdi,
 		return SR_ERR_DEV_CLOSED;
 
 	devc = sdi->priv;
-	devc->cb_data = cb_data;
 	devc->settings_ok = FALSE;
 	devc->buflen = 0;
 
-	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)
@@ -517,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;
 
@@ -525,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, dev_close,
 			sdi->conn, LOG_PREFIX);
 }