Match std_init() parameter order to the driver init() callback

[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 7e55d857f253c0c6e8731eb323cb8e0330ef3a1b..1c1cd300507100f95f52f13d5e4f15e499ec1d9e 100644 (file)
--- a/src/hardware/uni-t-dmm/api.c
+++ b/src/hardware/uni-t-dmm/api.c
@@ -34,8 +34,8 @@ static const uint32_t scanopts[] = {
 static const uint32_t devopts[] = {
        SR_CONF_MULTIMETER,
        SR_CONF_CONTINUOUS,
-       SR_CONF_LIMIT_SAMPLES | SR_CONF_SET,
-       SR_CONF_LIMIT_MSEC | SR_CONF_SET,
+       SR_CONF_LIMIT_SAMPLES | SR_CONF_SET | SR_CONF_GET,
+       SR_CONF_LIMIT_MSEC | SR_CONF_SET | SR_CONF_GET,
 };
 
 /*
@@ -48,7 +48,7 @@ static const uint32_t devopts[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
@@ -103,11 +103,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        return devices;
 }
 
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
-       return ((struct drv_context *)(di->context))->instances;
-}
-
 static int dev_open(struct sr_dev_inst *sdi)
 {
        struct sr_dev_driver *di;
@@ -143,18 +138,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:
-               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,
@@ -184,7 +168,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        struct dev_context *devc;
 
        devc = sdi->priv;
-       devc->starttime = g_get_monotonic_time();
+
+       sr_sw_limits_acquisition_start(&devc->limits);
 
        std_session_send_df_header(sdi, LOG_PREFIX);
 
@@ -213,7 +198,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
                        .init = init, \
                        .cleanup = std_cleanup, \
                        .scan = scan, \
-                       .dev_list = dev_list, \
+                       .dev_list = std_dev_list, \
                        .config_get = NULL, \
                        .config_set = config_set, \
                        .config_list = config_list, \