X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fopenbench-logic-sniffer%2Fols.c;h=d95e0827bbc1fe6a0af283a131ffe1d70d535e62;hb=1fdb75e14528abd62ebe727537512c741a5759da;hp=2138aa7033abb5a4e10b5a1e0329e4d78f2ef98e;hpb=06d64eb880876bd8a81c249e7b2f690eb03e12c1;p=libsigrok.git

diff --git a/hardware/openbench-logic-sniffer/ols.c b/hardware/openbench-logic-sniffer/ols.c
index 2138aa70..d95e0827 100644
--- a/hardware/openbench-logic-sniffer/ols.c
+++ b/hardware/openbench-logic-sniffer/ols.c
@@ -38,6 +38,10 @@
 #include <glib.h>
 #include <sigrok.h>
 
+#ifdef _WIN32
+#define O_NONBLOCK FIONBIO
+#endif
+
 #define NUM_PROBES			32
 #define NUM_TRIGGER_STAGES		4
 #define TRIGGER_TYPES			"01"
@@ -241,7 +245,7 @@ static int hw_init(char *deviceinfo)
 		 * we do all the sending first, then wait for all of them to
 		 * respond with g_poll().
 		 */
-		g_message("probing %s...", (char *)l->data);
+		g_message("ols: probing %s...", (char *)l->data);
 		fd = serial_open(l->data, O_RDWR | O_NONBLOCK);
 		if (fd != -1) {
 			serial_params[devcnt] = serial_backup_params(fd);
@@ -287,7 +291,7 @@ static int hw_init(char *deviceinfo)
 					else
 						sdi = sigrok_device_instance_new
 						    (final_devcnt, ST_INACTIVE,
-						     "Sump", "Logic Analyzer",
+						     "Openbench", "Logic Sniffer",
 						     "v1.0");
 					sdi->serial = serial_device_instance_new
 					    (device_names[i], -1);
@@ -425,7 +429,7 @@ static int set_configuration_samplerate(struct sigrok_device_instance *sdi,
 		divider = (CLOCK_RATE / samplerate) - 1;
 	}
 
-	g_message("setting samplerate to %" PRIu64 " Hz (divider %u, demux %s)",
+	g_message("ols: setting samplerate to %" PRIu64 " Hz (divider %u, demux %s)",
 			samplerate, divider, flag_reg & FLAG_DEMUX ? "on" : "off");
 
 	if (send_longcommand(sdi->serial->fd, CMD_SET_DIVIDER, reverse32(divider)) != SIGROK_OK)
@@ -458,6 +462,7 @@ static int hw_set_configuration(int device_index, int capability, void *value)
 	case HWCAP_LIMIT_SAMPLES:
 		tmp_u64 = value;
 		limit_samples = *tmp_u64;
+		g_message("ols: sample limit %" PRIu64, limit_samples);
 		ret = SIGROK_OK;
 		break;
 	case HWCAP_CAPTURE_RATIO:
@@ -514,9 +519,9 @@ static int receive_data(int fd, int revents, void *user_data)
 			return FALSE;
 
 		sample[num_bytes++] = byte;
-		g_debug("received byte 0x%.2x", byte);
+		g_debug("ols: received byte 0x%.2x", byte);
 		if (num_bytes == num_channels) {
-			g_debug("received sample 0x%.*x", num_bytes * 2, (int) *sample);
+			g_debug("ols: received sample 0x%.*x", num_bytes * 2, (int) *sample);
 			/* Got a full sample. */
 			if (flag_reg & FLAG_RLE) {
 				/*
@@ -573,7 +578,7 @@ static int receive_data(int fd, int revents, void *user_data)
 					}
 				}
 				memcpy(sample, tmp_sample, 4);
-				g_debug("full sample 0x%.8x", (int) *sample);
+				g_debug("ols: full sample 0x%.8x", (int) *sample);
 			}
 
 			/* the OLS sends its sample buffer backwards.
@@ -603,8 +608,9 @@ static int receive_data(int fd, int revents, void *user_data)
 			 */
 			if (trigger_at > 0) {
 				/* there are pre-trigger samples, send those first */
-				packet.type = DF_LOGIC32;
+				packet.type = DF_LOGIC;
 				packet.length = trigger_at * 4;
+				packet.unitsize = 4;
 				packet.payload = raw_sample_buf;
 				session_bus(user_data, &packet);
 			}
@@ -613,13 +619,15 @@ static int receive_data(int fd, int revents, void *user_data)
 			packet.length = 0;
 			session_bus(user_data, &packet);
 
-			packet.type = DF_LOGIC32;
+			packet.type = DF_LOGIC;
 			packet.length = (limit_samples * 4) - (trigger_at * 4);
+			packet.unitsize = 4;
 			packet.payload = raw_sample_buf + trigger_at * 4;
 			session_bus(user_data, &packet);
 		} else {
-			packet.type = DF_LOGIC32;
+			packet.type = DF_LOGIC;
 			packet.length = limit_samples * 4;
+			packet.unitsize = 4;
 			packet.payload = raw_sample_buf;
 			session_bus(user_data, &packet);
 		}
@@ -659,7 +667,6 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	if (trigger_mask[0]) {
 		delaycount = readcount * (1 - capture_ratio / 100.0);
 		trigger_at = (readcount - delaycount) * 4 - num_stages;
-		g_message("ta %d", trigger_at);
 
 		if (send_longcommand(sdi->serial->fd, CMD_SET_TRIGGER_MASK_0,
 			reverse32(trigger_mask[0])) != SIGROK_OK)
@@ -730,12 +737,9 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 		if (probe_mask & (0xff << (i * 8)))
 			changrp_mask |= (1 << i);
 	}
-	g_message("changrp_mask 0x%.2x", changrp_mask);
 
 	/* The flag register wants them here, and 1 means "disable channel". */
 	flag_reg |= ~(changrp_mask << 2) & 0x3c;
-	g_message("flag_reg 0x%.2x", flag_reg & 0x3c);
-
 	flag_reg |= FLAG_FILTER;
 	data = flag_reg << 24;
 	if (send_longcommand(sdi->serial->fd, CMD_SET_FLAGS, data) != SIGROK_OK)
@@ -760,7 +764,8 @@ static int hw_start_acquisition(int device_index, gpointer session_device_id)
 	gettimeofday(&header->starttime, NULL);
 	header->samplerate = cur_samplerate;
 	header->protocol_id = PROTO_RAW;
-	header->num_probes = NUM_PROBES;
+	header->num_logic_probes = NUM_PROBES;
+	header->num_analog_probes = 0;
 	session_bus(session_device_id, packet);
 	g_free(header);
 	g_free(packet);
@@ -781,7 +786,7 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id)
 }
 
 struct device_plugin ols_plugin_info = {
-	"sump",
+	"ols",
 	1,
 	hw_init,
 	hw_cleanup,