std_init(): Drop check if pass in driver is non-NULL

[libsigrok.git] / src / hardware / chronovu-la / api.c

diff --git a/src/hardware/chronovu-la/api.c b/src/hardware/chronovu-la/api.c
index 5914ef21d4ca3faf812d01bf47b3f78d1f464a76..322ac3b0b37b5dcb78c6b9b013af7b6af9959baa 100644 (file)
--- a/src/hardware/chronovu-la/api.c
+++ b/src/hardware/chronovu-la/api.c
@@ -47,7 +47,7 @@ static const int32_t trigger_matches[] = {
        SR_TRIGGER_FALLING,
 };
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
+static int dev_acquisition_stop(struct sr_dev_inst *sdi);
 
 static void clear_helper(void *priv)
 {
@@ -66,7 +66,7 @@ static int dev_clear(const struct sr_dev_driver *di)
 
 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);
 }
 
 static int add_device(int model, struct libusb_device_descriptor *des,
@@ -92,7 +92,6 @@ static int add_device(int model, struct libusb_device_descriptor *des,
        devc->cur_samplerate = 0; /* Set later (different for LA8/LA16). */
        devc->limit_msec = 0;
        devc->limit_samples = 0;
-       devc->cb_data = NULL;
        memset(devc->mangled_buf, 0, BS);
        devc->final_buf = NULL;
        devc->trigger_pattern = 0x0000; /* Irrelevant, see trigger_mask. */
@@ -246,18 +245,12 @@ 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 int dev_open(struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
        int ret;
 
-       if (!(devc = sdi->priv))
-               return SR_ERR_BUG;
+       devc = sdi->priv;
 
        /* Allocate memory for the FTDI context and initialize it. */
        if (!(devc->ftdic = ftdi_new())) {
@@ -325,11 +318,6 @@ static int dev_close(struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int cleanup(const struct sr_dev_driver *di)
-{
-       return dev_clear(di);
-}
-
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
                const struct sr_channel_group *cg)
 {
@@ -478,7 +466,7 @@ static int receive_data(int fd, int revents, void *cb_data)
        /* Get one block of data. */
        if ((ret = cv_read_block(devc)) < 0) {
                sr_err("Failed to read data block: %d.", ret);
-               dev_acquisition_stop(sdi, sdi);
+               dev_acquisition_stop(sdi);
                return FALSE;
        }
 
@@ -499,14 +487,14 @@ static int receive_data(int fd, int revents, void *cb_data)
         * full 8MByte first, only then the whole buffer contains valid data.
         */
        for (i = 0; i < NUM_BLOCKS; i++)
-               cv_send_block_to_session_bus(devc, i);
+               cv_send_block_to_session_bus(sdi, i);
 
-       dev_acquisition_stop(sdi, sdi);
+       dev_acquisition_stop(sdi);
 
        return TRUE;
 }
 
-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;
        uint8_t buf[8];
@@ -562,8 +550,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
        sr_dbg("Hardware acquisition started successfully.");
 
-       devc->cb_data = cb_data;
-
        std_session_send_df_header(sdi, LOG_PREFIX);
 
        /* Time when we should be done (for detecting trigger timeouts). */
@@ -578,10 +564,8 @@ 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)
 {
-       (void)cb_data;
-
        sr_dbg("Stopping acquisition.");
        sr_session_source_remove(sdi->session, -1);
        std_session_send_df_end(sdi, LOG_PREFIX);
@@ -594,9 +578,9 @@ SR_PRIV struct sr_dev_driver chronovu_la_driver_info = {
        .longname = "ChronoVu LA8/LA16",
        .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,