X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmotech-lps-30x%2Fapi.c;h=1fe0d86cc15fe194c3a737ede8030f351cc4bc70;hb=b02bb45f4cf6378520e5a5b82ff39013cfa270b6;hp=ee1f4f7edf8384cce9a340b7f607db7bb4a3daa7;hpb=15a5bfe4815f9991a9bb532c05d6244a1818a0e4;p=libsigrok.git

diff --git a/src/hardware/motech-lps-30x/api.c b/src/hardware/motech-lps-30x/api.c
index ee1f4f7e..1fe0d86c 100644
--- a/src/hardware/motech-lps-30x/api.c
+++ b/src/hardware/motech-lps-30x/api.c
@@ -370,7 +370,6 @@ static GSList *do_scan(lps_modelid modelid, struct sr_dev_driver *drv, GSList *o
 	struct sr_serial_dev_inst *serial;
 	struct sr_channel *ch;
 	struct sr_channel_group *cg;
-	GSList *devices;
 	const char *conn, *serialcomm;
 	int cnt, ret;
 	gchar buf[LINELEN_MAX];
@@ -380,7 +379,6 @@ static GSList *do_scan(lps_modelid modelid, struct sr_dev_driver *drv, GSList *o
 	sdi = NULL;
 	devc = NULL;
 	conn = serialcomm = NULL;
-	devices = NULL;
 
 	sr_spew("scan() called!");
 
@@ -468,17 +466,13 @@ static GSList *do_scan(lps_modelid modelid, struct sr_dev_driver *drv, GSList *o
 		sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
 	}
 
-	devices = g_slist_append(devices, sdi);
-
 	/* Query status */
 	if (lps_query_status(sdi) != SR_OK)
 		goto exit_err;
 
 	serial_close(serial);
-	if (!devices)
-		sr_serial_dev_inst_free(serial);
 
-	return std_scan_complete(drv, devices);
+	return std_scan_complete(drv, g_slist_append(NULL, sdi));
 
 exit_err:
 	sr_info("%s: Error!", __func__);
@@ -776,7 +770,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	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(sdi, LOG_PREFIX);
+	std_session_send_df_header(sdi);
 
 	sr_sw_limits_acquisition_start(&devc->limits);
 
@@ -786,12 +780,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-	return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
-			sdi->conn, LOG_PREFIX);
-}
-
 static struct sr_dev_driver motech_lps_301_driver_info = {
 	.name = "motech-lps-301",
 	.longname = "Motech LPS-301",
@@ -807,7 +795,7 @@ static struct sr_dev_driver motech_lps_301_driver_info = {
 	.dev_open = std_serial_dev_open,
 	.dev_close = std_serial_dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
-	.dev_acquisition_stop = dev_acquisition_stop,
+	.dev_acquisition_stop = std_serial_dev_acquisition_stop,
 	.context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(motech_lps_301_driver_info);