X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmanson-hcs-3xxx%2Fapi.c;h=b6449cf6a79d9daf428384971b4b035a1cd630e5;hb=15a5bfe4815f9991a9bb532c05d6244a1818a0e4;hp=4a253a18ebfc40587efce9b661d2645a73bcb35f;hpb=c2fdcc25a47c4c8f25e3ea96ea36a674a151e839;p=libsigrok.git

diff --git a/src/hardware/manson-hcs-3xxx/api.c b/src/hardware/manson-hcs-3xxx/api.c
index 4a253a18..b6449cf6 100644
--- a/src/hardware/manson-hcs-3xxx/api.c
+++ b/src/hardware/manson-hcs-3xxx/api.c
@@ -73,12 +73,9 @@ static const struct hcs_model models[] = {
 	ALL_ZERO
 };
 
-SR_PRIV struct sr_dev_driver manson_hcs_3xxx_driver_info;
-
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
 	int i, model_id;
-	struct drv_context *drvc;
 	struct dev_context *devc;
 	struct sr_dev_inst *sdi;
 	struct sr_config *src;
@@ -87,8 +84,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	struct sr_serial_dev_inst *serial;
 	char reply[50], **tokens, *dummy;
 
-	drvc = di->context;
-	drvc->instances = NULL;
 	devices = NULL;
 	conn = NULL;
 	serialcomm = NULL;
@@ -149,7 +144,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	sdi->model = g_strdup(models[model_id].name);
 	sdi->inst_type = SR_INST_SERIAL;
 	sdi->conn = serial;
-	sdi->driver = di;
 
 	sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "CH1");
 
@@ -180,14 +174,13 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 	devc->voltage_max_device = g_strtod(tokens[0], &dummy) * devc->model->voltage[2];
 	g_strfreev(tokens);
 
-	drvc->instances = g_slist_append(drvc->instances, sdi);
 	devices = g_slist_append(devices, sdi);
 
 	serial_close(serial);
 	if (!devices)
 		sr_serial_dev_inst_free(serial);
 
-	return devices;
+	return std_scan_complete(di, devices);
 
 exit_err:
 	sr_dev_inst_free(sdi);
@@ -387,7 +380,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 			std_serial_dev_close, sdi->conn, LOG_PREFIX);
 }
 
-SR_PRIV struct sr_dev_driver manson_hcs_3xxx_driver_info = {
+static struct sr_dev_driver manson_hcs_3xxx_driver_info = {
 	.name = "manson-hcs-3xxx",
 	.longname = "Manson HCS-3xxx",
 	.api_version = 1,
@@ -404,3 +397,4 @@ SR_PRIV struct sr_dev_driver manson_hcs_3xxx_driver_info = {
 	.dev_acquisition_stop = dev_acquisition_stop,
 	.context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(manson_hcs_3xxx_driver_info);