X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fopenbench-logic-sniffer%2Fapi.c;h=620f5e1bde9155df76996b36315e3b2b3f5c6e5b;hb=515ab0889ebde4b373d620044a1a98da37153056;hp=cb55bf19a6f891b0cc3abe24c4bbf8c4f7215cec;hpb=c368e6f3d248a73d69cd0c2c4a7c88a92def55e3;p=libsigrok.git

diff --git a/src/hardware/openbench-logic-sniffer/api.c b/src/hardware/openbench-logic-sniffer/api.c
index cb55bf19..620f5e1b 100644
--- a/src/hardware/openbench-logic-sniffer/api.c
+++ b/src/hardware/openbench-logic-sniffer/api.c
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "protocol.h"
 #include <libserialport.h>
+#include "protocol.h"
 
 #define SERIALCOMM "115200/8n1"
 
@@ -70,11 +70,10 @@ static const char *patterns[] = {
 };
 
 /* Channels are numbered 0-31 (on the PCB silkscreen). */
-SR_PRIV const char *ols_channel_names[NUM_CHANNELS + 1] = {
+SR_PRIV const char *ols_channel_names[] = {
 	"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12",
 	"13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23",
 	"24", "25", "26", "27", "28", "29", "30", "31",
-	NULL,
 };
 
 /* Default supported samplerates, can be overridden by device metadata. */
@@ -84,23 +83,22 @@ static const uint64_t samplerates[] = {
 	SR_HZ(1),
 };
 
+#define RESPONSE_DELAY_US (10 * 1000)
+
 SR_PRIV struct sr_dev_driver ols_driver_info;
-static struct sr_dev_driver *di = &ols_driver_info;
 
-static int init(struct sr_context *sr_ctx)
+static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
 {
 	return std_init(sr_ctx, di, LOG_PREFIX);
 }
 
-static GSList *scan(GSList *options)
+static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
 	struct sr_config *src;
 	struct sr_dev_inst *sdi;
 	struct drv_context *drvc;
 	struct dev_context *devc;
-	struct sr_channel *ch;
 	struct sr_serial_dev_inst *serial;
-	GPollFD probefd;
 	GSList *l, *devices;
 	int ret, i;
 	const char *conn, *serialcomm;
@@ -125,11 +123,10 @@ static GSList *scan(GSList *options)
 	if (!conn)
 		return NULL;
 
-	if (serialcomm == NULL)
+	if (!serialcomm)
 		serialcomm = SERIALCOMM;
 
-	if (!(serial = sr_serial_dev_inst_new(conn, serialcomm)))
-		return NULL;
+	serial = sr_serial_dev_inst_new(conn, serialcomm);
 
 	/* The discovery procedure is like this: first send the Reset
 	 * command (0x00) 5 times, since the device could be anywhere
@@ -155,25 +152,33 @@ static GSList *scan(GSList *options)
 	}
 	send_shortcommand(serial, CMD_ID);
 
-	/* Wait 10ms for a response. */
-	g_usleep(10000);
+	g_usleep(RESPONSE_DELAY_US);
 
-	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) {
+
+	g_usleep(RESPONSE_DELAY_US);
+
+	if (sp_input_waiting(serial->data) != 0) {
 		/* Got metadata. */
 		sdi = get_metadata(serial);
 		devc = sdi->priv;
@@ -186,11 +191,9 @@ static GSList *scan(GSList *options)
 		sdi->model = g_strdup("Logic Analyzer");
 		sdi->version = g_strdup("v1.0");
 		sdi->driver = di;
-		for (i = 0; i < 32; i++) {
-			ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE,
+		for (i = 0; i < 32; i++)
+			sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE,
 					ols_channel_names[i]);
-			sdi->channels = g_slist_append(sdi->channels, ch);
-		}
 		devc = ols_dev_new();
 		sdi->priv = devc;
 	}
@@ -209,12 +212,12 @@ static GSList *scan(GSList *options)
 	return devices;
 }
 
-static GSList *dev_list(void)
+static GSList *dev_list(const struct sr_dev_driver *di)
 {
 	return ((struct drv_context *)(di->priv))->instances;
 }
 
-static int cleanup(void)
+static int cleanup(const struct sr_dev_driver *di)
 {
 	return std_dev_clear(di, NULL);
 }