X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmotech-lps-30x%2Fapi.c;h=7f9c33f68d43943fb0fc47cdf6394bb2fe3b61cb;hb=c50805d59ce85e00ef263c0a1edad2487bb8a9fe;hp=83fbcd2cbcbd0a77b0ffe41a26749511795ec5f5;hpb=6ec6c43b4738dbc7091f4a49a4ec80ea6102cb52;p=libsigrok.git

diff --git a/src/hardware/motech-lps-30x/api.c b/src/hardware/motech-lps-30x/api.c
index 83fbcd2c..7f9c33f6 100644
--- a/src/hardware/motech-lps-30x/api.c
+++ b/src/hardware/motech-lps-30x/api.c
@@ -151,7 +151,8 @@ SR_PRIV int lps_send_va(struct sr_serial_dev_inst *serial, const char *fmt, va_l
 
 	sr_spew("lps_send_va: \"%s\"", buf);
 
-	retc = serial_write_blocking(serial, buf, strlen(buf), 0);
+	retc = serial_write_blocking(serial, buf, strlen(buf),
+			serial_timeout(serial, strlen(buf)));
 
 	if (retc < 0)
 		return SR_ERR;
@@ -241,7 +242,7 @@ SR_PRIV int lps_process_status(struct sr_dev_inst *sdi, int stat)
 	struct dev_context *devc;
 	int tracking_mode;
 
-	devc = (struct dev_context *)sdi->priv;
+	devc = sdi->priv;
 
 	sr_spew("Status: %d", stat);
 	devc->channel_status[0].cc_mode = (stat & 0x01) != 0;
@@ -288,7 +289,7 @@ SR_PRIV int lps_query_status(struct sr_dev_inst *sdi)
 	int stat, ret;
 	struct dev_context *devc;
 
-	devc = (struct dev_context *)sdi->priv;
+	devc = sdi->priv;
 
 	devc->req_sent_at = g_get_real_time();
 
@@ -795,7 +796,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_serial_dev_inst *serial;
@@ -810,7 +811,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	serial = sdi->conn;
 	serial_source_add(sdi->session, serial, G_IO_IN, 50,
 			motech_lps_30x_receive_data, (void *)sdi);
-	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)
@@ -822,7 +823,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 	return SR_OK;
 }
 
-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;
 
@@ -830,7 +831,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, std_serial_dev_close,
+	return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
 			sdi->conn, LOG_PREFIX);
 }