sr/drivers: fix off-by-one if frontend-initiated probe configuration

[libsigrok.git] / hardware / openbench-logic-sniffer / ols.c

diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c
index 3619701f3ec4740ed3890f2c018fe2b9b6e6402c..970f779331b84e29e8a9431d7aad02dba4ab9715 100644 (file)
--- a/hardware/openbench-logic-sniffer/ols.c
+++ b/hardware/openbench-logic-sniffer/ols.c
@@ -154,7 +154,7 @@ static int configure_probes(struct context *ctx, const GSList *probes)
                 * Set up the probe mask for later configuration into the
                 * flag register.
                 */
-               probe_bit = 1 << (probe->index - 1);
+               probe_bit = 1 << (probe->index);
                ctx->probe_mask |= probe_bit;
 
                if (!probe->trigger)
@@ -234,6 +234,7 @@ static struct sr_dev_inst *get_metadata(int fd)
        guchar tmp_c;
 
        sdi = sr_dev_inst_new(0, SR_ST_INACTIVE, NULL, NULL, NULL);
+       sdi->driver = odi;
        ctx = ols_dev_new();
        sdi->priv = ctx;
 
@@ -468,6 +469,7 @@ static GSList *hw_scan(GSList *options)
                        /* not an OLS -- some other board that uses the sump protocol */
                        sdi = sr_dev_inst_new(final_devcnt, SR_ST_INACTIVE,
                                        "Sump", "Logic Analyzer", "v1.0");
+                       sdi->driver = odi;
                        ctx = ols_dev_new();
                        for (j = 0; j < 32; j++) {
                                if (!(probe = sr_probe_new(j, SR_PROBE_LOGIC, TRUE,
@@ -507,14 +509,10 @@ hw_init_free_ports:
        return devices;
 }
 
-static int hw_dev_open(int dev_index)
+static int hw_dev_open(struct sr_dev_inst *sdi)
 {
-       struct sr_dev_inst *sdi;
        struct context *ctx;
 
-       if (!(sdi = sr_dev_inst_get(odi->instances, dev_index)))
-               return SR_ERR;
-
        ctx = sdi->priv;
 
        ctx->serial->fd = serial_open(ctx->serial->port, O_RDWR);
@@ -526,19 +524,12 @@ static int hw_dev_open(int dev_index)
        return SR_OK;
 }
 
-static int hw_dev_close(int dev_index)
+static int hw_dev_close(struct sr_dev_inst *sdi)
 {
-       struct sr_dev_inst *sdi;
        struct context *ctx;
 
-       if (!(sdi = sr_dev_inst_get(odi->instances, dev_index))) {
-               sr_err("ols: %s: sdi was NULL", __func__);
-               return SR_ERR_BUG;
-       }
-
        ctx = sdi->priv;
 
-       /* TODO */
        if (ctx->serial->fd != -1) {
                serial_close(ctx->serial->fd);
                ctx->serial->fd = -1;
@@ -591,6 +582,9 @@ static int hw_info_get(int info_id, const void **data,
        case SR_DI_INST:
                *data = sdi;
                break;
+       case SR_DI_HWCAPS:
+               *data = hwcaps;
+               break;
        case SR_DI_NUM_PROBES:
                *data = GINT_TO_POINTER(1);
                break;
@@ -617,17 +611,7 @@ 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;
-
-       if (!(sdi = sr_dev_inst_get(odi->instances, dev_index)))
-               return SR_ST_NOT_FOUND;
-
-       return sdi->status;
-}
-
-static int set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate)
+static int set_samplerate(const struct sr_dev_inst *sdi, uint64_t samplerate)
 {
        struct context *ctx;
 
@@ -659,15 +643,13 @@ static int set_samplerate(struct sr_dev_inst *sdi, uint64_t samplerate)
        return SR_OK;
 }
 
-static int hw_dev_config_set(int dev_index, int hwcap, const void *value)
+static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
+               const void *value)
 {
-       struct sr_dev_inst *sdi;
        struct context *ctx;
        int ret;
        const uint64_t *tmp_u64;
 
-       if (!(sdi = sr_dev_inst_get(odi->instances, dev_index)))
-               return SR_ERR;
        ctx = sdi->priv;
 
        if (sdi->status != SR_ST_ACTIVE)
@@ -892,12 +874,12 @@ static int receive_data(int fd, int revents, void *cb_data)
        return TRUE;
 }
 
-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_datafeed_packet *packet;
        struct sr_datafeed_header *header;
        struct sr_datafeed_meta_logic meta;
-       struct sr_dev_inst *sdi;
        struct context *ctx;
        uint32_t trigger_config[4];
        uint32_t data;
@@ -906,9 +888,6 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
        int num_channels;
        int i;
 
-       if (!(sdi = sr_dev_inst_get(odi->instances, dev_index)))
-               return SR_ERR;
-
        ctx = sdi->priv;
 
        if (sdi->status != SR_ST_ACTIVE)
@@ -1052,12 +1031,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_datafeed_packet packet;
 
        /* Avoid compiler warnings. */
-       (void)dev_index;
+       (void)sdi;
 
        packet.type = SR_DF_END;
        sr_session_send(cb_data, &packet);
@@ -1075,7 +1055,6 @@ SR_PRIV struct sr_dev_driver ols_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,