Add helper function for scan completion

[libsigrok.git] / src / hardware / uni-t-dmm / api.c

diff --git a/src/hardware/uni-t-dmm/api.c b/src/hardware/uni-t-dmm/api.c
index 6e8663e501e7f6bba03b03fa65baecc13ac76388..02e301cc2a7841ab8d149adb8a63af6b84e2b901 100644 (file)
--- a/src/hardware/uni-t-dmm/api.c
+++ b/src/hardware/uni-t-dmm/api.c
@@ -46,11 +46,6 @@ static const uint32_t devopts[] = {
  * default of 2400 being used (which will not work with this DMM, of course).
  */
 
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-       return std_init(di, sr_ctx);
-}
-
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
        GSList *usb_devices, *devices, *l;
@@ -92,15 +87,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)
@@ -190,12 +183,12 @@ 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, \
                        .api_version = 1, \
-                       .init = init, \
+                       .init = std_init, \
                        .cleanup = std_cleanup, \
                        .scan = scan, \
                        .dev_list = std_dev_list, \
@@ -210,9 +203,9 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
                }, \
                VENDOR, MODEL, BAUDRATE, PACKETSIZE, \
                VALID, PARSE, DETAILS, sizeof(struct CHIPSET##_info) \
-       }
+       }).di
 
-SR_PRIV const struct dmm_info *uni_t_dmm_drivers[] = {
+SR_REGISTER_DEV_DRIVER_LIST(uni_t_dmm_drivers,
        DMM(
                "tecpel-dmm-8061", fs9721,
                "Tecpel", "DMM-8061", 2400,
@@ -382,5 +375,4 @@ SR_PRIV const struct dmm_info *uni_t_dmm_drivers[] = {
                sr_es519xx_19200_11b_packet_valid, sr_es519xx_19200_11b_parse,
                NULL
        ),
-       NULL
-};
+);