std_serial_dev_acquisition_stop(): Drop unneeded parameter.

[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 7eca205c78bdd22864e9f0ec643c47ca12ff62a1..5aa5b217cd2f09e888202e23a65173cb8503b7cb 100644 (file)
--- a/src/hardware/korad-kaxxxxp/api.c
+++ b/src/hardware/korad-kaxxxxp/api.c
@@ -50,10 +50,15 @@ 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}},
-       {KORAD_KA3005D, "Korad", "KA3005P",
+       {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
 };
 
@@ -133,7 +138,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));
@@ -375,7 +381,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;
@@ -384,10 +390,8 @@ 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);
+       std_session_send_df_header(sdi, LOG_PREFIX);
 
        devc->starttime = g_get_monotonic_time();
        devc->num_samples = 0;
@@ -401,12 +405,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);
 }