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

[libsigrok.git] / src / hardware / maynuo-m97 / api.c

diff --git a/src/hardware/maynuo-m97/api.c b/src/hardware/maynuo-m97/api.c
index 4b92446e93ea37ef0ecc03e09f8303e0905cf331..59f9c7ff960d67ef34968df8c479ed9d702e1660 100644 (file)
--- a/src/hardware/maynuo-m97/api.c
+++ b/src/hardware/maynuo-m97/api.c
@@ -31,7 +31,7 @@ static const uint32_t drvopts[] = {
 };
 
 static const uint32_t devopts[] = {
-       SR_CONF_CONTINUOUS | SR_CONF_SET,
+       SR_CONF_CONTINUOUS,
        SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
        SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
 };
@@ -113,7 +113,7 @@ SR_PRIV struct sr_dev_driver maynuo_m97_driver_info;
 
 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 struct sr_dev_inst *probe_device(struct sr_modbus_dev_inst *modbus)
@@ -199,16 +199,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_clear(const struct sr_dev_driver *di)
-{
-       return std_dev_clear(di, g_free);
-}
-
 static int dev_open(struct sr_dev_inst *sdi)
 {
        struct sr_modbus_dev_inst *modbus = sdi->conn;
@@ -253,11 +243,6 @@ static int dev_close(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int cleanup(const struct sr_dev_driver *di)
-{
-       return dev_clear(di);
-}
-
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
                const struct sr_channel_group *cg)
 {
@@ -275,10 +260,8 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
        ret = SR_OK;
        switch (key) {
        case SR_CONF_LIMIT_SAMPLES:
-               *data = g_variant_new_uint64(devc->limit_samples);
-               break;
        case SR_CONF_LIMIT_MSEC:
-               *data = g_variant_new_uint64(devc->limit_msec);
+               ret = sr_sw_limits_config_get(&devc->limits, key, data);
                break;
        case SR_CONF_ENABLED:
                if ((ret = maynuo_m97_get_bit(modbus, ISTATE, &ivalue)) == SR_OK)
@@ -351,7 +334,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        struct sr_modbus_dev_inst *modbus;
        int ret;
 
-       (void)data;
        (void)cg;
 
        if (sdi->status != SR_ST_ACTIVE)
@@ -363,10 +345,8 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
        ret = SR_OK;
        switch (key) {
        case SR_CONF_LIMIT_SAMPLES:
-               devc->limit_samples = g_variant_get_uint64(data);
-               break;
        case SR_CONF_LIMIT_MSEC:
-               devc->limit_msec = g_variant_get_uint64(data);
+               ret = sr_sw_limits_config_set(&devc->limits, key, data);
                break;
        case SR_CONF_ENABLED:
                ret = maynuo_m97_set_input(modbus, g_variant_get_boolean(data));
@@ -453,14 +433,12 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
        return ret;
 }
 
-static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
        struct sr_modbus_dev_inst *modbus;
        int ret;
 
-       (void)cb_data;
-
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
@@ -471,20 +449,16 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
                        maynuo_m97_receive_data, (void *)sdi)) != SR_OK)
                return ret;
 
+       sr_sw_limits_acquisition_start(&devc->limits);
        std_session_send_df_header(sdi, LOG_PREFIX);
 
-       devc->num_samples = 0;
-       devc->starttime = g_get_monotonic_time();
-
        return maynuo_m97_capture_start(sdi);
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
        struct sr_modbus_dev_inst *modbus;
 
-       (void)cb_data;
-
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
@@ -501,10 +475,9 @@ SR_PRIV struct sr_dev_driver maynuo_m97_driver_info = {
        .longname = "maynuo M97/M98 series",
        .api_version = 1,
        .init = init,
-       .cleanup = cleanup,
+       .cleanup = std_cleanup,
        .scan = scan,
-       .dev_list = dev_list,
-       .dev_clear = dev_clear,
+       .dev_list = std_dev_list,
        .config_get = config_get,
        .config_set = config_set,
        .config_list = config_list,