dev_acquisition_{start,stop}(): Drop duplicate 'cb_data' parameter.

[libsigrok.git] / src / hardware / gmc-mh-1x-2x / api.c

diff --git a/src/hardware/gmc-mh-1x-2x/api.c b/src/hardware/gmc-mh-1x-2x/api.c
index db11b027994412b13488bad0ce1df8efb4347336..2b7bfca6c6ebead378b8babaeca3a4f29a434783 100644 (file)
--- a/src/hardware/gmc-mh-1x-2x/api.c
+++ b/src/hardware/gmc-mh-1x-2x/api.c
@@ -165,7 +165,6 @@ static GSList *scan_1x_2x_rs232(struct sr_dev_driver *di, GSList *options)
        drvc = di->context;
        drvc->instances = NULL;
        conn = serialcomm = NULL;
-       model = METRAHIT_NONE;
        serialcomm_given = FALSE;
 
        sr_spew("scan_1x_2x_rs232() called!");
@@ -461,24 +460,19 @@ static int config_list_bd(uint32_t key, GVariant **data, const struct sr_dev_ins
        return SR_OK;
 }
 
-static int dev_acquisition_start_1x_2x_rs232(const struct sr_dev_inst *sdi,
-                                            void *cb_data)
+static int dev_acquisition_start_1x_2x_rs232(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
 
-       if (!sdi || !cb_data || !(devc = sdi->priv))
-               return SR_ERR_BUG;
-
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
-       devc->cb_data = cb_data;
+       devc = sdi->priv;
        devc->settings_ok = FALSE;
        devc->buflen = 0;
 
-       /* Send header packet to the session bus. */
-       std_session_send_df_header(cb_data, LOG_PREFIX);
+       std_session_send_df_header(sdi, LOG_PREFIX);
 
        /* Start timer, if required. */
        if (devc->limit_msec)
@@ -492,24 +486,19 @@ static int dev_acquisition_start_1x_2x_rs232(const struct sr_dev_inst *sdi,
        return SR_OK;
 }
 
-static int dev_acquisition_start_2x_bd232(const struct sr_dev_inst *sdi,
-                                         void *cb_data)
+static int dev_acquisition_start_2x_bd232(const struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
 
-       if (!sdi || !cb_data || !(devc = sdi->priv))
-               return SR_ERR_BUG;
-
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
-       devc->cb_data = cb_data;
+       devc = sdi->priv;
        devc->settings_ok = FALSE;
        devc->buflen = 0;
 
-       /* Send header packet to the session bus. */
-       std_session_send_df_header(cb_data, LOG_PREFIX);
+       std_session_send_df_header(sdi, LOG_PREFIX);
 
        /* Start timer, if required. */
        if (devc->limit_msec)
@@ -524,7 +513,7 @@ static int dev_acquisition_start_2x_bd232(const struct sr_dev_inst *sdi,
        return req_meas14(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 dev_context *devc;
 
@@ -532,7 +521,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
        if (sdi && (devc = sdi->priv) && devc->limit_msec)
                g_timer_stop(devc->elapsed_msec);
 
-       return std_serial_dev_acquisition_stop(sdi, cb_data, dev_close,
+       return std_serial_dev_acquisition_stop(sdi, sdi, dev_close,
                        sdi->conn, LOG_PREFIX);
 }