arachnid-labs-re-load-pro: Use software limit helpers

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

diff --git a/src/hardware/fluke-dmm/api.c b/src/hardware/fluke-dmm/api.c
index 8d4ed2bb32c96b277ae22b2c89b70ee632083844..eba36c549824b5c8b8cc2e7cd6a8d4d275246953 100644 (file)
--- a/src/hardware/fluke-dmm/api.c
+++ b/src/hardware/fluke-dmm/api.c
@@ -39,8 +39,6 @@ static const uint32_t devopts[] = {
        SR_CONF_LIMIT_MSEC | SR_CONF_SET,
 };
 
-SR_PRIV struct sr_dev_driver flukedmm_driver_info;
-
 static const char *scan_conn[] = {
        /* 287/289 */
        "115200/8n1",
@@ -59,16 +57,10 @@ static const struct flukedmm_profile supported_flukedmm[] = {
        { FLUKE_289, "289", 100, 1000 },
 };
 
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-       return std_init(di, sr_ctx, LOG_PREFIX);
-}
-
 static GSList *fluke_scan(struct sr_dev_driver *di, const char *conn,
                const char *serialcomm)
 {
        struct sr_dev_inst *sdi;
-       struct drv_context *drvc;
        struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
        GSList *devices;
@@ -80,7 +72,6 @@ static GSList *fluke_scan(struct sr_dev_driver *di, const char *conn,
        if (serial_open(serial, SERIAL_RDWR) != SR_OK)
                return NULL;
 
-       drvc = di->context;
        b = buf;
        retry = 0;
        devices = NULL;
@@ -131,9 +122,7 @@ static GSList *fluke_scan(struct sr_dev_driver *di, const char *conn,
                                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;
                        }
@@ -147,7 +136,7 @@ static GSList *fluke_scan(struct sr_dev_driver *di, const char *conn,
        if (!devices)
                sr_serial_dev_inst_free(serial);
 
-       return devices;
+       return std_scan_complete(di, devices);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
@@ -199,10 +188,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
-       if (!(devc = sdi->priv)) {
-               sr_err("sdi->priv was NULL.");
-               return SR_ERR_BUG;
-       }
+       devc = sdi->priv;
 
        switch (key) {
        case SR_CONF_LIMIT_MSEC:
@@ -274,11 +260,11 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
                        sdi->conn, LOG_PREFIX);
 }
 
-SR_PRIV struct sr_dev_driver flukedmm_driver_info = {
+static struct sr_dev_driver flukedmm_driver_info = {
        .name = "fluke-dmm",
        .longname = "Fluke 18x/28x series DMMs",
        .api_version = 1,
-       .init = init,
+       .init = std_init,
        .cleanup = std_cleanup,
        .scan = scan,
        .dev_list = std_dev_list,
@@ -292,3 +278,4 @@ SR_PRIV struct sr_dev_driver flukedmm_driver_info = {
        .dev_acquisition_stop = dev_acquisition_stop,
        .context = NULL,
 };
+SR_REGISTER_DEV_DRIVER(flukedmm_driver_info);