std_serial_dev_acquisition_stop(): Drop unneeded parameter.

[libsigrok.git] / src / hardware / manson-hcs-3xxx / api.c

diff --git a/src/hardware/manson-hcs-3xxx/api.c b/src/hardware/manson-hcs-3xxx/api.c
index 81370e9f9007382fbb79409c1f6d5c04a0d40f80..cc9ab74a0283d906f0fcb128f057e583b89a3791 100644 (file)
--- a/src/hardware/manson-hcs-3xxx/api.c
+++ b/src/hardware/manson-hcs-3xxx/api.c
@@ -20,10 +20,11 @@
  */
 
 /** @file
-  *  <em>Manson HCS-3xxx Series</em> power supply driver
+  *  <em>Manson HCS-3xxx series</em> power supply driver
   *  @internal
   */
 
+#include <config.h>
 #include "protocol.h"
 
 static const uint32_t drvopts[] = {
@@ -69,7 +70,7 @@ static const struct hcs_model models[] = {
        { MANSON_HCS_3600, "HCS-3600-USB", "3600", { 1, 16, 0.1 }, { 0, 60,   0.10 } },
        { MANSON_HCS_3602, "HCS-3602-USB", "3602", { 1, 32, 0.1 }, { 0, 30,   0.10 } },
        { MANSON_HCS_3604, "HCS-3604-USB", "3604", { 1, 60, 0.1 }, { 0, 15,   0.10 } },
-       { 0, NULL, NULL, { 0, 0, 0 }, { 0, 0, 0 }, },
+       ALL_ZERO
 };
 
 SR_PRIV struct sr_dev_driver manson_hcs_3xxx_driver_info;
@@ -144,12 +145,12 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                if (!strcmp(models[i].id, tokens[0]))
                        model_id = i;
        }
-       g_strfreev(tokens);
-
        if (model_id < 0) {
-               sr_err("Unknown model id '%s' detected, aborting.", tokens[0]);
+               sr_err("Unknown model ID '%s' detected, aborting.", tokens[0]);
+               g_strfreev(tokens);
                return NULL;
        }
+       g_strfreev(tokens);
 
        /* Init device instance, etc. */
        sdi = g_malloc0(sizeof(struct sr_dev_inst));
@@ -172,8 +173,10 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
            (hcs_read_reply(serial, 2, reply, sizeof(reply)) < 0))
                goto exit_err;
        tokens = g_strsplit((const gchar *)&reply, "\r", 2);
-       if (hcs_parse_volt_curr_mode(sdi, tokens) < 0)
+       if (hcs_parse_volt_curr_mode(sdi, tokens) < 0) {
+               g_strfreev(tokens);
                goto exit_err;
+       }
        g_strfreev(tokens);
 
        /* Get max. voltage and current. */
@@ -384,7 +387,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
        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;
@@ -393,10 +396,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;
@@ -411,9 +412,9 @@ 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)
 {
-       return std_serial_dev_acquisition_stop(sdi, cb_data,
+       return std_serial_dev_acquisition_stop(sdi,
                        std_serial_dev_close, sdi->conn, LOG_PREFIX);
 }