X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Funi-t-dmm%2Fapi.c;h=6176a460ed1f5a5b5486d0d1640a257e5230dadc;hb=3cc2028382637283884d03af7893003d85c9818a;hp=c708d879d0beb8ed45b10f32163326ac517bc3e8;hpb=dd5c48a6d567a3cac62c4b0058588273bbeea171;p=libsigrok.git

diff --git a/src/hardware/uni-t-dmm/api.c b/src/hardware/uni-t-dmm/api.c
index c708d879..6176a460 100644
--- a/src/hardware/uni-t-dmm/api.c
+++ b/src/hardware/uni-t-dmm/api.c
@@ -25,8 +25,6 @@
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
-#define UNI_T_UT_D04_NEW "1a86.e008"
-
 static const uint32_t scanopts[] = {
 	SR_CONF_CONN,
 };
@@ -87,15 +85,13 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 		sdi->vendor = g_strdup(dmm->vendor);
 		sdi->model = g_strdup(dmm->device);
 		sdi->priv = devc;
-		sdi->driver = di;
 		sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
 		sdi->inst_type = SR_INST_USB;
 		sdi->conn = usb;
-		drvc->instances = g_slist_append(drvc->instances, sdi);
 		devices = g_slist_append(devices, sdi);
 	}
 
-	return devices;
+	return std_scan_complete(di, devices);
 }
 
 static int dev_open(struct sr_dev_inst *sdi)
@@ -166,10 +162,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 	sr_sw_limits_acquisition_start(&devc->limits);
 
-	std_session_send_df_header(sdi, LOG_PREFIX);
+	std_session_send_df_header(sdi);
 
 	sr_session_source_add(sdi->session, -1, 0, 10 /* poll_timeout */,
-		      uni_t_dmm_receive_data, (void *)sdi);
+			uni_t_dmm_receive_data, (void *)sdi);
 
 	return SR_OK;
 }
@@ -177,7 +173,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
 	sr_dbg("Stopping acquisition.");
-	std_session_send_df_end(sdi, LOG_PREFIX);
+	std_session_send_df_end(sdi);
 	sr_session_source_remove(sdi->session, -1);
 
 	return SR_OK;
@@ -185,7 +181,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 
 #define DMM(ID, CHIPSET, VENDOR, MODEL, BAUDRATE, PACKETSIZE, \
 			VALID, PARSE, DETAILS) \
-    &((struct dmm_info) { \
+	&((struct dmm_info) { \
 		{ \
 			.name = ID, \
 			.longname = VENDOR " " MODEL, \