X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fnorma-dmm%2Fapi.c;h=1ff354c417db7675d19e45379443dd61b95945ba;hb=15f96409dc54fd2ef784c59156daedd9acfa78ed;hp=ee1c59ca30eb341cf2872204e92921e82c1795ce;hpb=dd5c48a6d567a3cac62c4b0058588273bbeea171;p=libsigrok.git

diff --git a/src/hardware/norma-dmm/api.c b/src/hardware/norma-dmm/api.c
index ee1c59ca..1ff354c4 100644
--- a/src/hardware/norma-dmm/api.c
+++ b/src/hardware/norma-dmm/api.c
@@ -68,7 +68,6 @@ static const char *get_typestr(int type, struct sr_dev_driver *drv)
 static GSList *scan(struct sr_dev_driver *drv, GSList *options)
 {
 	struct sr_dev_inst *sdi;
-	struct drv_context *drvc;
 	struct dev_context *devc;
 	struct sr_config *src;
 	struct sr_serial_dev_inst *serial;
@@ -79,8 +78,6 @@ static GSList *scan(struct sr_dev_driver *drv, GSList *options)
 	char req[10];
 
 	devices = NULL;
-	drvc = drv->context;
-	drvc->instances = NULL;
 	conn = serialcomm = NULL;
 
 	for (l = options; l; l = l->next) {
@@ -136,12 +133,9 @@ static GSList *scan(struct sr_dev_driver *drv, GSList *options)
 			devc = g_malloc0(sizeof(struct dev_context));
 			sr_sw_limits_init(&devc->limits);
 			devc->type = auxtype;
-			devc->version = g_strdup(&buf[9]);
 			sdi->conn = serial;
 			sdi->priv = devc;
-			sdi->driver = drv;
 			sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1");
-			drvc->instances = g_slist_append(drvc->instances, sdi);
 			devices = g_slist_append(devices, sdi);
 			break;
 		}
@@ -164,22 +158,7 @@ static GSList *scan(struct sr_dev_driver *drv, GSList *options)
 	if (!devices)
 		sr_serial_dev_inst_free(serial);
 
-	return devices;
-}
-
-static int dev_close(struct sr_dev_inst *sdi)
-{
-	struct dev_context *devc;
-
-	std_serial_dev_close(sdi);
-
-	/* Free dynamically allocated resources. */
-	if ((devc = sdi->priv) && devc->version) {
-		g_free(devc->version);
-		devc->version = NULL;
-	}
-
-	return SR_OK;
+	return std_scan_complete(drv, devices);
 }
 
 static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
@@ -230,7 +209,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 	devc = sdi->priv;
 
 	sr_sw_limits_acquisition_start(&devc->limits);
-	std_session_send_df_header(sdi, LOG_PREFIX);
+	std_session_send_df_header(sdi);
 
 	/* Poll every 100ms, or whenever some data comes in. */
 	serial = sdi->conn;
@@ -242,8 +221,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-	return std_serial_dev_acquisition_stop(sdi, dev_close,
-			sdi->conn, LOG_PREFIX);
+	return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close);
 }
 
 static struct sr_dev_driver norma_dmm_driver_info = {
@@ -259,7 +237,7 @@ static struct sr_dev_driver norma_dmm_driver_info = {
 	.config_set = config_set,
 	.config_list = config_list,
 	.dev_open = std_serial_dev_open,
-	.dev_close = dev_close,
+	.dev_close = std_serial_dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
 	.dev_acquisition_stop = dev_acquisition_stop,
 	.context = NULL,
@@ -279,7 +257,7 @@ static struct sr_dev_driver siemens_b102x_driver_info = {
 	.config_set = config_set,
 	.config_list = config_list,
 	.dev_open = std_serial_dev_open,
-	.dev_close = dev_close,
+	.dev_close = std_serial_dev_close,
 	.dev_acquisition_start = dev_acquisition_start,
 	.dev_acquisition_stop = dev_acquisition_stop,
 	.context = NULL,