Route sr_source_remove for all serial devices through a wrapper.

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

diff --git a/hardware/openbench-logic-sniffer/protocol.c b/hardware/openbench-logic-sniffer/protocol.c
index dddc37e43dcb1c043aecd44146f986973779459a..09306dbef6afd87869d980788035ce748b3c4abb 100644 (file)
--- a/hardware/openbench-logic-sniffer/protocol.c
+++ b/hardware/openbench-logic-sniffer/protocol.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
  *
@@ -74,6 +74,11 @@ SR_PRIV int ols_configure_probes(const struct sr_dev_inst *sdi)
                if (!probe->enabled)
                        continue;
 
+               if (probe->index >= devc->max_probes) {
+                       sr_err("Channels over the limit of %d\n", devc->max_probes);
+                       return SR_ERR;
+               }
+
                /*
                 * Set up the probe mask for later configuration into the
                 * flag register.
@@ -99,7 +104,7 @@ SR_PRIV int ols_configure_probes(const struct sr_dev_inst *sdi)
                                return SR_ERR;
                }
                if (stage > devc->num_stages)
-                       devc->num_stages = stage;
+                       devc->num_stages = stage - 1;
        }
 
        return SR_OK;
@@ -147,8 +152,6 @@ SR_PRIV struct dev_context *ols_dev_new(void)
        devc->probe_mask = 0xffffffff;
        devc->flag_reg = 0;
 
-       devc->serial = NULL;
-
        return devc;
 }
 
@@ -299,10 +302,16 @@ SR_PRIV int ols_set_samplerate(const struct sr_dev_inst *sdi,
                return SR_ERR_SAMPLERATE;
 
        if (samplerate > CLOCK_RATE) {
+               sr_info("Enabling demux mode.");
                devc->flag_reg |= FLAG_DEMUX;
+               devc->flag_reg &= ~FLAG_FILTER;
+               devc->max_probes = NUM_PROBES / 2;
                devc->cur_samplerate_divider = (CLOCK_RATE * 2 / samplerate) - 1;
        } else {
+               sr_info("Disabling demux mode.");
                devc->flag_reg &= ~FLAG_DEMUX;
+               devc->flag_reg |= FLAG_FILTER;
+               devc->max_probes = NUM_PROBES;
                devc->cur_samplerate_divider = (CLOCK_RATE / samplerate) - 1;
        }
 
@@ -322,10 +331,10 @@ SR_PRIV int ols_set_samplerate(const struct sr_dev_inst *sdi,
 SR_PRIV void abort_acquisition(const struct sr_dev_inst *sdi)
 {
        struct sr_datafeed_packet packet;
-       struct dev_context *devc;
+       struct sr_serial_dev_inst *serial;
 
-       devc = sdi->priv;
-       sr_source_remove(devc->serial->fd);
+       serial = sdi->conn;
+       serial_source_remove(serial);
 
        /* Terminate session */
        packet.type = SR_DF_END;
@@ -334,14 +343,16 @@ SR_PRIV void abort_acquisition(const struct sr_dev_inst *sdi)
 
 SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data)
 {
+       struct drv_context *drvc;
+       struct dev_context *devc;
+       struct sr_serial_dev_inst *serial;
        struct sr_datafeed_packet packet;
        struct sr_datafeed_logic logic;
        struct sr_dev_inst *sdi;
-       struct drv_context *drvc;
-       struct dev_context *devc;
        GSList *l;
        uint32_t sample;
-       int num_channels, offset, i, j;
+       int num_channels, offset, j;
+       unsigned int i;
        unsigned char byte;
 
        drvc = di->priv;
@@ -351,7 +362,8 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data)
        for (l = drvc->instances; l; l = l->next) {
                sdi = l->data;
                devc = sdi->priv;
-               if (devc->serial->fd == fd)
+               serial = sdi->conn;
+               if (serial->fd == fd)
                        break;
                devc = NULL;
        }
@@ -378,13 +390,15 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data)
        }
 
        num_channels = 0;
-       for (i = 0x20; i > 0x02; i /= 2) {
-               if ((devc->flag_reg & i) == 0)
+
+       for (i = NUM_PROBES; i > 0x02; i /= 2) {
+               if ((devc->flag_reg & i) == 0) {
                        num_channels++;
+               }
        }
 
-       if (revents == G_IO_IN) {
-               if (serial_read(devc->serial, &byte, 1) != 1)
+       if (revents == G_IO_IN && devc->num_samples < devc->limit_samples) {
+               if (serial_read(serial, &byte, 1) != 1)
                        return FALSE;
 
                /* Ignore it if we've read enough. */
@@ -394,23 +408,22 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data)
                devc->sample[devc->num_bytes++] = byte;
                sr_dbg("Received byte 0x%.2x.", byte);
                if (devc->num_bytes == num_channels) {
-                       /* Got a full sample. */
+                       /* Got a full sample. Convert from the OLS's little-endian
+                        * sample to the local format. */
                        sample = devc->sample[0] | (devc->sample[1] << 8) \
                                        | (devc->sample[2] << 16) | (devc->sample[3] << 24);
                        sr_dbg("Received sample 0x%.*x.", devc->num_bytes * 2, sample);
                        if (devc->flag_reg & FLAG_RLE) {
                                /*
-                                * In RLE mode -1 should never come in as a
-                                * sample, because bit 31 is the "count" flag.
+                                * In RLE mode the high bit of the sample is the
+                                * "count" flag, meaning this sample is the number
+                                * of times the previous sample occurred.
                                 */
                                if (devc->sample[devc->num_bytes - 1] & 0x80) {
-                                       devc->sample[devc->num_bytes - 1] &= 0x7f;
-                                       /*
-                                        * FIXME: This will only work on
-                                        * little-endian systems.
-                                        */
+                                       /* Clear the high bit. */
+                                       sample &= ~(0x80 << (devc->num_bytes - 1) * 8);
                                        devc->rle_count = sample;
-                                       sr_dbg("RLE count: %d.", devc->rle_count);
+                                       sr_dbg("RLE count: %u.", devc->rle_count);
                                        devc->num_bytes = 0;
                                        return TRUE;
                                }
@@ -442,6 +455,9 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data)
                                                 * sample.
                                                 */
                                                devc->tmp_sample[i] = devc->sample[j++];
+                                       } else if (devc->flag_reg & FLAG_DEMUX && (i > 2)) {
+                                               /* group 2 & 3 get added to 0 & 1 */
+                                               devc->tmp_sample[i - 2] = devc->sample[j++];
                                        }
                                }
                                memcpy(devc->sample, devc->tmp_sample, 4);
@@ -506,9 +522,8 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data)
                }
                g_free(devc->raw_sample_buf);
 
-               serial_flush(devc->serial);
+               serial_flush(serial);
                abort_acquisition(sdi);
-               serial_close(devc->serial);
        }
 
        return TRUE;