X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fopenbench-logic-sniffer%2Fprotocol.c;h=afd0dc6f7f54518c2561f7fee4fc6e67856e05bd;hb=045e9a99186396694fb10f3155a7fb868705ecb8;hp=ff2af5850c0191560204f68a61f7969349969c23;hpb=13d8e03c4f9fb6fe9c5f682ab957173effe42d43;p=libsigrok.git

diff --git a/hardware/openbench-logic-sniffer/protocol.c b/hardware/openbench-logic-sniffer/protocol.c
index ff2af585..afd0dc6f 100644
--- 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;
@@ -133,15 +138,19 @@ SR_PRIV struct dev_context *ols_dev_new(void)
 {
 	struct dev_context *devc;
 
-	if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
+	if (!(devc = g_try_malloc(sizeof(struct dev_context)))) {
 		sr_err("Device context malloc failed.");
 		return NULL;
 	}
 
+	/* Device-specific settings */
+	devc->max_samples = devc->max_samplerate = devc->protocol_version = 0;
+
+	/* Acquisition settings */
+	devc->limit_samples = devc->capture_ratio = 0;
 	devc->trigger_at = -1;
 	devc->probe_mask = 0xffffffff;
-	devc->cur_samplerate = SR_KHZ(200);
-	devc->serial = NULL;
+	devc->flag_reg = 0;
 
 	return devc;
 }
@@ -284,23 +293,21 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial)
 }
 
 SR_PRIV int ols_set_samplerate(const struct sr_dev_inst *sdi,
-			       uint64_t samplerate,
-			       const struct sr_samplerates *samplerates)
+		const uint64_t samplerate)
 {
 	struct dev_context *devc;
 
 	devc = sdi->priv;
-	if (devc->max_samplerate) {
-		if (samplerate > devc->max_samplerate)
-			return SR_ERR_SAMPLERATE;
-	} else if (samplerate < samplerates->low || samplerate > samplerates->high)
+	if (devc->max_samplerate && samplerate > devc->max_samplerate)
 		return SR_ERR_SAMPLERATE;
 
 	if (samplerate > CLOCK_RATE) {
 		devc->flag_reg |= FLAG_DEMUX;
+		devc->max_probes = NUM_PROBES / 2;
 		devc->cur_samplerate_divider = (CLOCK_RATE * 2 / samplerate) - 1;
 	} else {
 		devc->flag_reg &= ~FLAG_DEMUX;
+		devc->max_probes = NUM_PROBES;
 		devc->cur_samplerate_divider = (CLOCK_RATE / samplerate) - 1;
 	}
 
@@ -311,7 +318,7 @@ SR_PRIV int ols_set_samplerate(const struct sr_dev_inst *sdi,
 	if (devc->flag_reg & FLAG_DEMUX)
 		devc->cur_samplerate *= 2;
 	if (devc->cur_samplerate != samplerate)
-		sr_err("Can't match samplerate %" PRIu64 ", using %"
+		sr_info("Can't match samplerate %" PRIu64 ", using %"
 		       PRIu64 ".", samplerate, devc->cur_samplerate);
 
 	return SR_OK;
@@ -320,10 +327,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;
+	sr_source_remove(serial->fd);
 
 	/* Terminate session */
 	packet.type = SR_DF_END;
@@ -332,13 +339,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;
-	int num_channels, offset, i, j;
+	uint32_t sample;
+	int num_channels, offset, j;
+	unsigned int i;
 	unsigned char byte;
 
 	drvc = di->priv;
@@ -348,7 +358,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;
 	}
@@ -375,13 +386,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. */
@@ -391,22 +404,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. */
-			sr_dbg("Received sample 0x%.*x.",
-			       devc->num_bytes * 2, *(int *)devc->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.
-					 */
-					devc->rle_count = *(int *)(devc->sample);
-					sr_dbg("RLE count: %d.", devc->rle_count);
+					/* Clear the high bit. */
+					sample &= ~(0x80 << (devc->num_bytes - 1) * 8);
+					devc->rle_count = sample;
+					sr_dbg("RLE count: %u.", devc->rle_count);
 					devc->num_bytes = 0;
 					return TRUE;
 				}
@@ -438,10 +451,13 @@ 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);
-				sr_dbg("Full sample: 0x%.8x.", *(int *)devc->sample);
+				sr_dbg("Full sample: 0x%.8x.", sample);
 			}
 
 			/* the OLS sends its sample buffer backwards.
@@ -502,9 +518,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;