Match std_init() parameter order to the driver init() callback

[libsigrok.git] / src / hardware / hung-chang-dso-2100 / api.c

diff --git a/src/hardware/hung-chang-dso-2100/api.c b/src/hardware/hung-chang-dso-2100/api.c
index 9f2d56a063eb810e0c8a0e041836fca9e79b1c70..eb2246f61a6a8465dfd1cb7b58ba386efc80524a 100644 (file)
--- a/src/hardware/hung-chang-dso-2100/api.c
+++ b/src/hardware/hung-chang-dso-2100/api.c
@@ -106,7 +106,7 @@ static const uint8_t coupling_map[] = {
 
 static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
-       return std_init(sr_ctx, di, LOG_PREFIX);
+       return std_init(di, sr_ctx, LOG_PREFIX);
 }
 
 static GSList *scan_port(GSList *devices, struct sr_dev_driver *di,
@@ -230,11 +230,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
        return devices;
 }
 
-static GSList *dev_list(const struct sr_dev_driver *di)
-{
-       return ((struct drv_context *)(di->context))->instances;
-}
-
 static void clear_private(void *priv)
 {
        struct dev_context *devc = priv;
@@ -311,18 +306,6 @@ static int dev_close(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int cleanup(const struct sr_dev_driver *di)
-{
-       struct drv_context *drvc = di->context;
-       int ret;
-
-       ret = dev_clear(di);
-
-       g_free(drvc);
-
-       return ret;
-}
-
 static int find_in_array(GVariant *data, const GVariantType *type,
                         const void *arr, int n)
 {
@@ -686,7 +669,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 = sdi->priv;
        int ret;
@@ -702,7 +685,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
                devc->factor /= relays[(devc->cctl[devc->channel - 1] >> 4) & 0x03];
        }
        devc->frame = 0;
-       devc->cb_data = cb_data;
        devc->state_known = TRUE;
        devc->step = 0;
        devc->adc2 = FALSE;
@@ -712,7 +694,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        if (ret != SR_OK)
                return ret;
 
-       std_session_send_df_header(cb_data, LOG_PREFIX);
+       std_session_send_df_header(sdi, LOG_PREFIX);
 
        sr_session_source_add(sdi->session, -1, 0, 8,
                              hung_chang_dso_2100_poll, (void *)sdi);
@@ -720,22 +702,21 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        return SR_OK;
 }
 
-SR_PRIV int hung_chang_dso_2100_dev_acquisition_stop(const struct sr_dev_inst *sdi,
-               void *cb_data)
+SR_PRIV int hung_chang_dso_2100_dev_acquisition_stop(const struct sr_dev_inst *sdi)
 {
        if (sdi->status != SR_ST_ACTIVE)
                return SR_ERR_DEV_CLOSED;
 
-       std_session_send_df_end(cb_data, LOG_PREFIX);
+       std_session_send_df_end(sdi, LOG_PREFIX);
        sr_session_source_remove(sdi->session, -1);
        hung_chang_dso_2100_move_to(sdi, 1);
 
        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 hung_chang_dso_2100_dev_acquisition_stop(sdi, cb_data);
+       return hung_chang_dso_2100_dev_acquisition_stop(sdi);
 }
 
 SR_PRIV struct sr_dev_driver hung_chang_dso_2100_driver_info = {
@@ -743,9 +724,9 @@ SR_PRIV struct sr_dev_driver hung_chang_dso_2100_driver_info = {
        .longname = "Hung-Chang DSO-2100",
        .api_version = 1,
        .init = init,
-       .cleanup = cleanup,
+       .cleanup = std_cleanup,
        .scan = scan,
-       .dev_list = dev_list,
+       .dev_list = std_dev_list,
        .dev_clear = dev_clear,
        .config_get = config_get,
        .config_set = config_set,