config_list: Don't check for sdi->priv != NULL.

[libsigrok.git] / src / hardware / korad-kaxxxxp / api.c

diff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c
index c195f1f84a31aa0a4577380735e676659e3e13bd..e008cfe4a4282d230a0674f780372b9f6c303833 100644 (file)
--- a/src/hardware/korad-kaxxxxp/api.c
+++ b/src/hardware/korad-kaxxxxp/api.c
@@ -50,18 +50,20 @@ static const uint32_t devopts[] = {
 
 static const struct korad_kaxxxxp_model models[] = {
        /* Device enum, vendor, model, ID reply, channels, voltage, current */
-       {VELLEMAN_LABPS_3005D, "Velleman", "LABPS3005D",
+       {VELLEMAN_PS3005D, "Velleman", "PS3005D",
+               "VELLEMANPS3005DV2.0", 1, {0, 31, 0.01}, {0, 5, 0.001}},
+       {VELLEMAN_LABPS3005D, "Velleman", "LABPS3005D",
                "VELLEMANLABPS3005DV2.0", 1, {0, 31, 0.01}, {0, 5, 0.001}},
-       {0, NULL, NULL, NULL, 0, {0, 0, 0}, {0, 0, 0}}
+       {KORAD_KA3005P, "Korad", "KA3005P",
+               "KORADKA3005PV2.0", 1, {0, 31, 0.01}, {0, 5, 0.001}},
+       /* Sometimes the KA3005P has an extra 0x01 after the ID. */
+       {KORAD_KA3005P_0X01, "Korad", "KA3005P",
+               "KORADKA3005PV2.0\x01", 1, {0, 31, 0.01}, {0, 5, 0.001}},
+       ALL_ZERO
 };
 
 SR_PRIV struct sr_dev_driver korad_kaxxxxp_driver_info;
 
-static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
-{
-       return std_init(sr_ctx, di, LOG_PREFIX);
-}
-
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
        struct drv_context *drvc;
@@ -131,7 +133,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                sr_err("Unknown model ID '%s' detected, aborting.", reply);
                return NULL;
        }
-       sr_dbg("Found: %s %s", models[model_id].vendor, models[model_id].name);
+       sr_dbg("Found: %s %s (idx %d, ID '%s').", models[model_id].vendor,
+               models[model_id].name, model_id, models[model_id].id);
 
        /* Init device instance, etc. */
        sdi = g_malloc0(sizeof(struct sr_dev_inst));
@@ -145,6 +148,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "CH1");
 
        devc = g_malloc0(sizeof(struct dev_context));
+       sr_sw_limits_init(&devc->limits);
        devc->model = &models[model_id];
        devc->reply[5] = 0;
        devc->req_sent_at = 0;
@@ -170,22 +174,6 @@ exit_err:
        return NULL;
 }
 
-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, NULL);
-}
-
-static int cleanup(const struct sr_dev_driver *di)
-{
-       dev_clear(di);
-       return SR_OK;
-}
-
 static int config_get(uint32_t key, GVariant **data,
        const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
@@ -199,12 +187,7 @@ static int config_get(uint32_t key, GVariant **data,
        devc = sdi->priv;
 
        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);
-               break;
+               return sr_sw_limits_config_get(&devc->limits, key, data);
        case SR_CONF_VOLTAGE:
                *data = g_variant_new_double(devc->voltage);
                break;
@@ -253,15 +236,8 @@ static int config_set(uint32_t key, GVariant *data,
 
        switch (key) {
        case SR_CONF_LIMIT_MSEC:
-               if (g_variant_get_uint64(data) == 0)
-                       return SR_ERR_ARG;
-               devc->limit_msec = g_variant_get_uint64(data);
-               break;
        case SR_CONF_LIMIT_SAMPLES:
-               if (g_variant_get_uint64(data) == 0)
-                       return SR_ERR_ARG;
-               devc->limit_samples = g_variant_get_uint64(data);
-               break;
+               return sr_sw_limits_config_set(&devc->limits, key, data);
        case SR_CONF_VOLTAGE_TARGET:
                dval = g_variant_get_double(data);
                if (dval < devc->model->voltage[0] || dval > devc->model->voltage[1])
@@ -312,7 +288,6 @@ static int config_set(uint32_t key, GVariant *data,
 static int config_list(uint32_t key, GVariant **data,
        const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
-
        struct dev_context *devc;
        GVariant *gvar;
        GVariantBuilder gvb;
@@ -373,7 +348,7 @@ static int config_list(uint32_t key, GVariant **data,
        return SR_OK;
 }
 
-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_serial_dev_inst *serial;
@@ -382,13 +357,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
                return SR_ERR_DEV_CLOSED;
 
        devc = sdi->priv;
-       devc->cb_data = cb_data;
 
-       /* Send header packet to the session bus. */
-       std_session_send_df_header(cb_data, LOG_PREFIX);
+       sr_sw_limits_acquisition_start(&devc->limits);
+       std_session_send_df_header(sdi, LOG_PREFIX);
 
-       devc->starttime = g_get_monotonic_time();
-       devc->num_samples = 0;
        devc->reply_pending = FALSE;
        devc->req_sent_at = 0;
        serial = sdi->conn;
@@ -399,12 +371,12 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
-       return std_serial_dev_acquisition_stop(sdi, cb_data,
+       return std_serial_dev_acquisition_stop(sdi,
                std_serial_dev_close, sdi->conn, LOG_PREFIX);
 }
 
@@ -412,11 +384,10 @@ SR_PRIV struct sr_dev_driver korad_kaxxxxp_driver_info = {
        .name = "korad-kaxxxxp",
        .longname = "Korad KAxxxxP",
        .api_version = 1,
-       .init = init,
-       .cleanup = cleanup,
+       .init = std_init,
+       .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,