Add sr_dev_acquisition_start(), factor out SR_ERR_DEV_CLOSED check.

[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 de4efcd55458c15b1d29f907332dc4159b85ca50..a706675a771bd4eb7121dcef7fd86fd4f8cd2906 100644 (file)
--- a/src/hardware/fluke-dmm/api.c
+++ b/src/hardware/fluke-dmm/api.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
-#include "fluke-dmm.h"
+#include "protocol.h"
 
 static const uint32_t scanopts[] = {
        SR_CONF_CONN,
@@ -61,7 +61,6 @@ 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;
@@ -73,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;
@@ -120,13 +118,12 @@ static GSList *fluke_scan(struct sr_dev_driver *di, const char *conn,
                                sdi->model = g_strdup(tokens[0] + 6);
                                sdi->version = g_strdup(tokens[1] + s);
                                devc = g_malloc0(sizeof(struct dev_context));
+                               sr_sw_limits_init(&devc->limits);
                                devc->profile = &supported_flukedmm[i];
                                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;
                        }
@@ -140,7 +137,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)
@@ -194,19 +191,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
 
        devc = sdi->priv;
 
-       switch (key) {
-       case SR_CONF_LIMIT_MSEC:
-               /* TODO: not yet implemented */
-               devc->limit_msec = g_variant_get_uint64(data);
-               break;
-       case SR_CONF_LIMIT_SAMPLES:
-               devc->limit_samples = g_variant_get_uint64(data);
-               break;
-       default:
-               return SR_ERR_NA;
-       }
-
-       return SR_OK;
+       return sr_sw_limits_config_set(&devc->limits, key, data);
 }
 
 static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
@@ -236,12 +221,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
        devc = sdi->priv;
 
-       std_session_send_df_header(sdi, LOG_PREFIX);
+       sr_sw_limits_acquisition_start(&devc->limits);
+       std_session_send_df_header(sdi);
 
        /* Poll every 100ms, or whenever some data comes in. */
        serial = sdi->conn;
@@ -258,12 +241,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-       return std_serial_dev_acquisition_stop(sdi, std_serial_dev_close,
-                       sdi->conn, LOG_PREFIX);
-}
-
 static struct sr_dev_driver flukedmm_driver_info = {
        .name = "fluke-dmm",
        .longname = "Fluke 18x/28x series DMMs",
@@ -279,7 +256,7 @@ static struct sr_dev_driver flukedmm_driver_info = {
        .dev_open = std_serial_dev_open,
        .dev_close = std_serial_dev_close,
        .dev_acquisition_start = dev_acquisition_start,
-       .dev_acquisition_stop = dev_acquisition_stop,
+       .dev_acquisition_stop = std_serial_dev_acquisition_stop,
        .context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(flukedmm_driver_info);