sr: remove obsolete SR_DI_INST

[libsigrok.git] / hardware / asix-sigma / asix-sigma.c

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index 088095acb96d9177d2d24ff0d3996ed6c93df382..f801f5876a8ec6b965456b6a95d482296b359d8d 100644 (file)
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -123,7 +123,8 @@ static const char *firmware_files[] = {
        "asix-sigma-phasor.fw", /* Frequency counter */
 };
 
-static int hw_dev_acquisition_stop(int dev_index, void *cb_data);
+static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
+               void *cb_data);
 
 static int sigma_read(void *buf, size_t size, struct context *ctx)
 {
@@ -442,12 +443,13 @@ static int hw_init(void)
 static GSList *hw_scan(GSList *options)
 {
        struct sr_dev_inst *sdi;
+       struct sr_probe *probe;
        struct context *ctx;
        GSList *devices;
        struct ftdi_device_list *devlist;
        char serial_txt[10];
        uint32_t serial;
-       int ret;
+       int ret, i;
 
        (void)options;
        devices = NULL;
@@ -498,6 +500,14 @@ static GSList *hw_scan(GSList *options)
                goto free;
        }
        sdi->driver = adi;
+
+       for (i = 0; probe_names[i]; i++) {
+               if (!(probe = sr_probe_new(i, SR_PROBE_ANALOG, TRUE,
+                               probe_names[i])))
+                       return NULL;
+               sdi->probes = g_slist_append(sdi->probes, probe);
+       }
+
        devices = g_slist_append(devices, sdi);
        adi->instances = g_slist_append(adi->instances, sdi);
        sdi->priv = ctx;
@@ -682,7 +692,7 @@ static int configure_probes(const struct sr_dev_inst *sdi, const GSList *probes)
 
        for (l = probes; l; l = l->next) {
                probe = (struct sr_probe *)l->data;
-               probebit = 1 << (probe->index - 1);
+               probebit = 1 << (probe->index);
 
                if (!probe->enabled || !probe->trigger)
                        continue;
@@ -776,9 +786,6 @@ static int hw_info_get(int info_id, const void **data,
        struct context *ctx;
 
        switch (info_id) {
-       case SR_DI_INST:
-               *data = sdi;
-               break;
        case SR_DI_HWCAPS:
                *data = hwcaps;
                break;
@@ -808,17 +815,6 @@ static int hw_info_get(int info_id, const void **data,
        return SR_OK;
 }
 
-static int hw_dev_status_get(int dev_index)
-{
-       struct sr_dev_inst *sdi;
-
-       sdi = sr_dev_inst_get(adi->instances, dev_index);
-       if (sdi)
-               return sdi->status;
-       else
-               return SR_ST_NOT_FOUND;
-}
-
 static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
                const void *value)
 {
@@ -1053,7 +1049,7 @@ static int receive_data(int fd, int revents, void *cb_data)
                if (running_msec < ctx->limit_msec && numchunks < 32767)
                        return TRUE; /* While capturing... */
                else
-                       hw_dev_acquisition_stop(sdi->index, sdi);
+                       hw_dev_acquisition_stop(sdi, sdi);
 
        } else if (ctx->state.state == SIGMA_DOWNLOAD) {
                if (ctx->state.chunks_downloaded >= numchunks) {
@@ -1269,9 +1265,9 @@ static int build_basic_trigger(struct triggerlut *lut, struct context *ctx)
        return SR_OK;
 }
 
-static int hw_dev_acquisition_start(int dev_index, void *cb_data)
+static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
+               void *cb_data)
 {
-       struct sr_dev_inst *sdi;
        struct context *ctx;
        struct sr_datafeed_packet *packet;
        struct sr_datafeed_header *header;
@@ -1282,9 +1278,6 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
        struct triggerinout triggerinout_conf;
        struct triggerlut lut;
 
-       if (!(sdi = sr_dev_inst_get(adi->instances, dev_index)))
-               return SR_ERR;
-
        ctx = sdi->priv;
 
        /* If the samplerate has not been set, default to 200 kHz. */
@@ -1392,7 +1385,7 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
        sr_session_send(ctx->session_dev_id, packet);
 
        /* Add capture source. */
-       sr_source_add(0, G_IO_IN, 10, receive_data, sdi);
+       sr_source_add(0, G_IO_IN, 10, receive_data, (void *)sdi);
 
        g_free(header);
        g_free(packet);
@@ -1402,20 +1395,15 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
        return SR_OK;
 }
 
-static int hw_dev_acquisition_stop(int dev_index, void *cb_data)
+static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
+               void *cb_data)
 {
-       struct sr_dev_inst *sdi;
        struct context *ctx;
        uint8_t modestatus;
 
        /* Avoid compiler warnings. */
        (void)cb_data;
 
-       if (!(sdi = sr_dev_inst_get(adi->instances, dev_index))) {
-               sr_err("sigma: %s: sdi was NULL", __func__);
-               return SR_ERR_BUG;
-       }
-
        if (!(ctx = sdi->priv)) {
                sr_err("sigma: %s: sdi->priv was NULL", __func__);
                return SR_ERR_BUG;
@@ -1454,7 +1442,6 @@ SR_PRIV struct sr_dev_driver asix_sigma_driver_info = {
        .dev_open = hw_dev_open,
        .dev_close = hw_dev_close,
        .info_get = hw_info_get,
-       .dev_status_get = hw_dev_status_get,
        .dev_config_set = hw_dev_config_set,
        .dev_acquisition_start = hw_dev_acquisition_start,
        .dev_acquisition_stop = hw_dev_acquisition_stop,