From: Uwe Hermann <redacted>
Date: Fri, 13 Mar 2015 07:33:22 +0000 (+0100)
Subject: ols: Fix detection and acquisition on Windows.
X-Git-Tag: libsigrok-0.4.0~608
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=ed936ccc7c386c01c3a88f8c005f0d041f02f451;p=libsigrok.git

ols: Fix detection and acquisition on Windows.

Use the more portable sp_input_waiting() instead of g_poll() with FDs.
Thanks to Martin Ling for the hints. This is tested on Linux and Win7
using an OLS; scanning for the device and starting an acquisition works.

Also, add some more debug output.

This fixes bug #562.
---

diff --git a/src/hardware/openbench-logic-sniffer/api.c b/src/hardware/openbench-logic-sniffer/api.c
index acbb9718..07bb2eed 100644
--- a/src/hardware/openbench-logic-sniffer/api.c
+++ b/src/hardware/openbench-logic-sniffer/api.c
@@ -157,22 +157,32 @@ static GSList *scan(GSList *options)
 	/* Wait 10ms for a response. */
 	g_usleep(10000);
 
-	sp_get_port_handle(serial->data, &probefd.fd);
-	probefd.events = G_IO_IN;
-	g_poll(&probefd, 1, 1);
-
-	if (probefd.revents != G_IO_IN)
+	if (sp_input_waiting(serial->data) == 0) {
+		sr_dbg("Didn't get any reply.");
 		return NULL;
-	if (serial_read_blocking(serial, buf, 4, serial_timeout(serial, 4)) != 4)
+	}
+
+	ret = serial_read_blocking(serial, buf, 4, serial_timeout(serial, 4));
+	if (ret != 4) {
+		sr_err("Invalid reply (expected 4 bytes, got %d).", ret);
 		return NULL;
-	if (strncmp(buf, "1SLO", 4) && strncmp(buf, "1ALS", 4))
+	}
+
+	if (strncmp(buf, "1SLO", 4) && strncmp(buf, "1ALS", 4)) {
+		sr_err("Invalid reply (expected '1SLO' or '1ALS', got "
+		       "'%c%c%c%c').", buf[0], buf[1], buf[2], buf[3]);
 		return NULL;
+	}
 
 	/* Definitely using the OLS protocol, check if it supports
 	 * the metadata command.
 	 */
 	send_shortcommand(serial, CMD_METADATA);
-	if (g_poll(&probefd, 1, 10) > 0) {
+
+	/* Wait 10ms for a response. */
+	g_usleep(10000);
+
+	if (sp_input_waiting(serial->data) != 0) {
 		/* Got metadata. */
 		sdi = get_metadata(serial);
 		devc = sdi->priv;