sr: remove obsolete SR_DI_INST

[libsigrok.git] / hardware / fx2lafw / fx2lafw.c

diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c
index 8ae0cdf5bb1eb2f47a91ecec4c03d5dec1bab75d..7a83b58ba53e1b89b846c7dc68f7bd5de4f99895 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.c
+++ b/hardware/fx2lafw/fx2lafw.c
@@ -146,7 +146,8 @@ static struct sr_dev_driver *fdi = &fx2lafw_driver_info;
 static int hw_dev_close(struct sr_dev_inst *sdi);
 static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
                const void *value);
-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);
 
 /**
  * Check the USB configuration to determine if this is an fx2lafw device.
@@ -314,10 +315,10 @@ static int configure_probes(struct context *ctx, GSList *probes)
                if (probe->enabled == FALSE)
                        continue;
 
-               if (probe->index > 8)
+               if (probe->index > 7)
                        ctx->sample_wide = TRUE;
 
-               probe_bit = 1 << (probe->index - 1);
+               probe_bit = 1 << (probe->index);
                if (!(probe->trigger))
                        continue;
 
@@ -599,9 +600,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;
@@ -637,17 +635,6 @@ static int hw_info_get(int info_id, const void **data,
        return SR_OK;
 }
 
-static int hw_dev_status_get(int dev_index)
-{
-       const struct sr_dev_inst *const sdi =
-               sr_dev_inst_get(fdi->instances, dev_index);
-
-       if (!sdi)
-               return SR_ST_NOT_FOUND;
-
-       return sdi->status;
-}
-
 static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
                const void *value)
 {
@@ -928,9 +915,9 @@ static unsigned int get_timeout(struct context *ctx)
        return timeout + timeout / 4; /* Leave a headroom of 25% percent */
 }
 
-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 sr_datafeed_packet packet;
        struct sr_datafeed_header header;
        struct sr_datafeed_meta_logic meta;
@@ -941,10 +928,7 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
        int ret;
        unsigned char *buf;
 
-       if (!(sdi = sr_dev_inst_get(fdi->instances, dev_index)))
-               return SR_ERR;
        ctx = sdi->priv;
-
        if (ctx->submitted_transfers != 0)
                return SR_ERR;
 
@@ -1010,16 +994,13 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
 }
 
 /* TODO: This stops acquisition on ALL devices, ignoring dev_index. */
-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;
 
        /* Avoid compiler warnings. */
        (void)cb_data;
 
-       if (!(sdi = sr_dev_inst_get(fdi->instances, dev_index)))
-               return SR_ERR;
- 
        abort_acquisition(sdi->priv);
 
        return SR_OK;
@@ -1035,7 +1016,6 @@ SR_PRIV struct sr_dev_driver fx2lafw_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,