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

OLS: Calculate actual sample rate used.

This commit is contained in:
Gareth McMullin 2011-10-30 14:25:24 +13:00 committed by Bert Vermeulen
parent baf1d71477
commit 7583b99dbb
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hardware/openbench-logic-sniffer/ols.c
View File

@ -554,8 +554,6 @@ static int set_configuration_samplerate(struct sr_device_instance *sdi,
} else if (samplerate < samplerates.low || samplerate > samplerates.high) } else if (samplerate < samplerates.low || samplerate > samplerates.high)
return SR_ERR_SAMPLERATE; return SR_ERR_SAMPLERATE;
ols->cur_samplerate = samplerate;
ols->period_ps = 1000000000000 / samplerate;
if (samplerate > CLOCK_RATE) { if (samplerate > CLOCK_RATE) {
ols->flag_reg |= FLAG_DEMUX; ols->flag_reg |= FLAG_DEMUX;
ols->cur_samplerate_divider = (CLOCK_RATE * 2 / samplerate) - 1; ols->cur_samplerate_divider = (CLOCK_RATE * 2 / samplerate) - 1;
@ -564,6 +562,17 @@ static int set_configuration_samplerate(struct sr_device_instance *sdi,
ols->cur_samplerate_divider = (CLOCK_RATE / samplerate) - 1; ols->cur_samplerate_divider = (CLOCK_RATE / samplerate) - 1;
} }
/* Calculate actual samplerate used and complain if it is different
* from the requested.
*/
ols->cur_samplerate = CLOCK_RATE / (ols->cur_samplerate_divider + 1);
if(ols->flag_reg & FLAG_DEMUX)
ols->cur_samplerate *= 2;
ols->period_ps = 1000000000000 / ols->cur_samplerate;
if(ols->cur_samplerate != samplerate)
sr_warn("ols: can't match samplerate %" PRIu64 ", using %" PRIu64,
samplerate, ols->cur_samplerate);
return SR_OK; return SR_OK;
} }