ols: combine demux samples

[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 ba7828527fc74afd3a96517ce2a9bd820707ad58..1caf7c1a8ca0c5681c14a1fb14ee407e4a1a6b7c 100644 (file)
--- a/hardware/openbench-logic-sniffer/protocol.c
+++ b/hardware/openbench-logic-sniffer/protocol.c
@@ -99,7 +99,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;
@@ -340,7 +340,8 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data)
        struct sr_dev_inst *sdi;
        GSList *l;
        uint32_t sample;
-       int num_channels, offset, i, j;
+       int num_channels, offset, j;
+       unsigned int i, max_channels;
        unsigned char byte;
 
        drvc = di->priv;
@@ -378,9 +379,16 @@ 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)
+       max_channels = NUM_PROBES / (devc->flag_reg & FLAG_DEMUX ? 2 : 1);
+
+       for (i = NUM_PROBES; i > 0x02; i /= 2) {
+               if ((devc->flag_reg & i) == 0) {
+                       if (i >= max_channels) {
+                               sr_err("Channels over the limit of %d\n", max_channels);
+                               return FALSE;
+                       }
                        num_channels++;
+               }
        }
 
        if (revents == G_IO_IN && devc->num_samples < devc->limit_samples) {
@@ -394,23 +402,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 +449,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 3 & 4 get added to 1 & 2 */
+                                               devc->tmp_sample[i - 2] = devc->sample[j++];
                                        }
                                }
                                memcpy(devc->sample, devc->tmp_sample, 4);