From: Gareth McMullin <redacted>
Date: Sun, 30 Oct 2011 01:25:24 +0000 (+1300)
Subject: OLS: Calculate actual sample rate used.
X-Git-Tag: libsigrok-0.1.0~235
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=7583b99dbb2310ce2e34fd435c42634dec940ad6;p=libsigrok.git

OLS: Calculate actual sample rate used.
---

diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c
index 7308d8b2..35db8402 100644
--- a/hardware/openbench-logic-sniffer/ols.c
+++ b/hardware/openbench-logic-sniffer/ols.c
@@ -554,8 +554,6 @@ static int set_configuration_samplerate(struct sr_device_instance *sdi,
 	} else if (samplerate < samplerates.low || samplerate > samplerates.high)
 		return SR_ERR_SAMPLERATE;
 
-	ols->cur_samplerate = samplerate;
-	ols->period_ps = 1000000000000 / samplerate;
 	if (samplerate > CLOCK_RATE) {
 		ols->flag_reg |= FLAG_DEMUX;
 		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;
 	}
 
+	/* 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;
 }