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

[libsigrok.git] / src / hardware / center-3xx / api.c

diff --git a/src/hardware/center-3xx/api.c b/src/hardware/center-3xx/api.c
index 1d2a5669831a28c2fac8a1ddf356744c46ef155d..bdcb0169d21c3c70f786d728c92105008d48626b 100644 (file)
--- a/src/hardware/center-3xx/api.c
+++ b/src/hardware/center-3xx/api.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <config.h>
 #include "protocol.h"
 
 static const uint32_t scanopts[] = {
@@ -79,7 +80,7 @@ static GSList *center_scan(const char *conn, const char *serialcomm, int idx)
        if (serial_open(serial, SERIAL_RDWR) != SR_OK)
                return NULL;
 
-       drvc = center_devs[idx].di->priv;
+       drvc = center_devs[idx].di->context;
        devices = NULL;
        serial_flush(serial);
 
@@ -140,7 +141,7 @@ static GSList *scan(GSList *options, int idx)
 
 static GSList *dev_list(int idx)
 {
-       return ((struct drv_context *)(center_devs[idx].di->priv))->instances;
+       return ((struct drv_context *)(center_devs[idx].di->context))->instances;
 }
 
 static int cleanup(int idx)
@@ -203,8 +204,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, int idx)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi, int idx)
 {
        struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
@@ -213,12 +213,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
                return SR_ERR_DEV_CLOSED;
 
        devc = sdi->priv;
-       devc->cb_data = cb_data;
        devc->num_samples = 0;
        devc->starttime = g_get_monotonic_time();
 
-       /* Send header packet to the session bus. */
-       std_session_send_df_header(cb_data, LOG_PREFIX);
+       std_session_send_df_header(sdi, LOG_PREFIX);
 
        /* Poll every 500ms, or whenever some data comes in. */
        serial = sdi->conn;
@@ -228,9 +226,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
        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, sdi,
                        std_serial_dev_close, sdi->conn, LOG_PREFIX);
 }
 
@@ -251,8 +249,8 @@ static GSList *dev_list_##X(const struct sr_dev_driver *d) { \
 static int dev_clear_##X(const struct sr_dev_driver *d) { \
        (void)d; return dev_clear(X); }
 #define HW_DEV_ACQUISITION_START(X) \
-static int dev_acquisition_start_##X(const struct sr_dev_inst *sdi, \
-void *cb_data) { return dev_acquisition_start(sdi, cb_data, X); }
+static int dev_acquisition_start_##X(const struct sr_dev_inst *sdi \
+) { return dev_acquisition_start(sdi, X); }
 
 /* Driver structs and API function wrappers */
 #define DRV(ID, ID_UPPER, NAME, LONGNAME) \
@@ -278,7 +276,7 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \
        .dev_close = std_serial_dev_close, \
        .dev_acquisition_start = dev_acquisition_start_##ID_UPPER, \
        .dev_acquisition_stop = dev_acquisition_stop, \
-       .priv = NULL, \
+       .context = NULL, \
 };
 
 DRV(center_309, CENTER_309, "center-309", "Center 309")