BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ols: fixed channel limit check 

For demux mode we half the channels. Previous check method broke
the OLS randomly and but it in a bad state.

Signed-off-by: Matt Ranostay <mranostay@gmail.com>
This commit is contained in:
Matt Ranostay 2013-08-29 00:06:53 -07:00 committed by Bert Vermeulen
parent da970d24ec
commit b1de040700
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hardware/openbench-logic-sniffer/protocol.c
View File

@ -74,6 +74,11 @@ SR_PRIV int ols_configure_probes(const struct sr_dev_inst *sdi)
if (!probe->enabled) if (!probe->enabled)
continue; 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 * Set up the probe mask for later configuration into the
* flag register. * flag register.
@ -298,9 +303,11 @@ SR_PRIV int ols_set_samplerate(const struct sr_dev_inst *sdi,
if (samplerate > CLOCK_RATE) { if (samplerate > CLOCK_RATE) {
devc->flag_reg |= FLAG_DEMUX; devc->flag_reg |= FLAG_DEMUX;
devc->max_probes = NUM_PROBES / 2;
devc->cur_samplerate_divider = (CLOCK_RATE * 2 / samplerate) - 1; devc->cur_samplerate_divider = (CLOCK_RATE * 2 / samplerate) - 1;
} else { } else {
devc->flag_reg &= ~FLAG_DEMUX; devc->flag_reg &= ~FLAG_DEMUX;
devc->max_probes = NUM_PROBES;
devc->cur_samplerate_divider = (CLOCK_RATE / samplerate) - 1; devc->cur_samplerate_divider = (CLOCK_RATE / samplerate) - 1;
} }
@ -341,7 +348,7 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data)
GSList *l; GSList *l;
uint32_t sample; uint32_t sample;
int num_channels, offset, j; int num_channels, offset, j;
unsigned int i, max_channels; unsigned int i;
unsigned char byte; unsigned char byte;
drvc = di->priv; drvc = di->priv;
@ -379,14 +386,9 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data)
} }
num_channels = 0; num_channels = 0;
max_channels = NUM_PROBES / (devc->flag_reg & FLAG_DEMUX ? 2 : 1);
for (i = NUM_PROBES; i > 0x02; i /= 2) { for (i = NUM_PROBES; i > 0x02; i /= 2) {
if ((devc->flag_reg & i) == 0) { 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++; num_channels++;
} }
} }
@ -450,7 +452,7 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data)
*/ */
devc->tmp_sample[i] = devc->sample[j++]; devc->tmp_sample[i] = devc->sample[j++];
} else if (devc->flag_reg & FLAG_DEMUX && (i > 2)) { } else if (devc->flag_reg & FLAG_DEMUX && (i > 2)) {
/* group 3 & 4 get added to 1 & 2 */ /* group 2 & 3 get added to 0 & 1 */
devc->tmp_sample[i - 2] = devc->sample[j++]; devc->tmp_sample[i - 2] = devc->sample[j++];
} }
} }

1
hardware/openbench-logic-sniffer/protocol.h
View File

@ -82,6 +82,7 @@
/* Private, per-device-instance driver context. */ /* Private, per-device-instance driver context. */
struct dev_context { struct dev_context {
/* Fixed device settings */ /* Fixed device settings */
int max_probes;
uint32_t max_samples; uint32_t max_samples;
uint32_t max_samplerate; uint32_t max_samplerate;
uint32_t protocol_version; uint32_t protocol_version;