X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fagilent-dmm%2Fapi.c;h=1165dc5ae3056702f0050bd1a9d53fa1b2fb9ed7;hb=15a5bfe4815f9991a9bb532c05d6244a1818a0e4;hp=bb7c53e48aefa683011b537331937e7c18840207;hpb=e32862ebccac5ae063abc68d9ce13a66ad46bb97;p=libsigrok.git

diff --git a/src/hardware/agilent-dmm/api.c b/src/hardware/agilent-dmm/api.c
index bb7c53e4..1165dc5a 100644
--- a/src/hardware/agilent-dmm/api.c
+++ b/src/hardware/agilent-dmm/api.c
@@ -73,7 +73,6 @@ static const struct agdmm_profile supported_agdmm[] = {
 static GSList *scan(struct sr_dev_driver *di, 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;
@@ -82,9 +81,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	const char *conn, *serialcomm;
 	char *buf, **tokens;
 
-	drvc = di->context;
-	drvc->instances = NULL;
-
 	devices = NULL;
 	conn = serialcomm = NULL;
 	for (l = options; l; l = l->next) {
@@ -137,9 +133,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 			sdi->inst_type = SR_INST_SERIAL;
 			sdi->conn = serial;
 			sdi->priv = devc;
-			sdi->driver = di;
 			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;
 		}
@@ -151,7 +145,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	if (!devices)
 		sr_serial_dev_inst_free(serial);
 
-	return devices;
+	return std_scan_complete(di, devices);
 }
 
 static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi,
@@ -229,7 +223,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 			sdi->conn, LOG_PREFIX);
 }
 
-SR_PRIV struct sr_dev_driver agdmm_driver_info = {
+static struct sr_dev_driver agdmm_driver_info = {
 	.name = "agilent-dmm",
 	.longname = "Agilent U12xx series DMMs",
 	.api_version = 1,
@@ -247,3 +241,4 @@ SR_PRIV struct sr_dev_driver agdmm_driver_info = {
 	.dev_acquisition_stop = dev_acquisition_stop,
 	.context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(agdmm_driver_info);