X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fopenbench-logic-sniffer%2Fprotocol.c;h=7b5ea6a51067566f85c66f2de2bac2801fc087ab;hb=889ef4a01cbf50d381cda0a1331b794a2c6d26c8;hp=09306dbef6afd87869d980788035ce748b3c4abb;hpb=7faa3e8821735e063e17fcad326c68aae14fe907;p=libsigrok.git

diff --git a/hardware/openbench-logic-sniffer/protocol.c b/hardware/openbench-logic-sniffer/protocol.c
index 09306dbe..7b5ea6a5 100644
--- a/hardware/openbench-logic-sniffer/protocol.c
+++ b/hardware/openbench-logic-sniffer/protocol.c
@@ -18,6 +18,7 @@
  */
 
 #include "protocol.h"
+#include <libserialport.h>
 
 extern SR_PRIV struct sr_dev_driver ols_driver_info;
 static struct sr_dev_driver *di = &ols_driver_info;
@@ -29,7 +30,7 @@ SR_PRIV int send_shortcommand(struct sr_serial_dev_inst *serial,
 
 	sr_dbg("Sending cmd 0x%.2x.", command);
 	buf[0] = command;
-	if (serial_write(serial, buf, 1) != 1)
+	if (serial_write_blocking(serial, buf, 1) != 1)
 		return SR_ERR;
 
 	return SR_OK;
@@ -46,7 +47,7 @@ SR_PRIV int send_longcommand(struct sr_serial_dev_inst *serial,
 	buf[2] = (data & 0xff0000) >> 16;
 	buf[3] = (data & 0xff00) >> 8;
 	buf[4] = data & 0xff;
-	if (serial_write(serial, buf, 5) != 5)
+	if (serial_write_blocking(serial, buf, 5) != 5)
 		return SR_ERR;
 
 	return SR_OK;
@@ -175,7 +176,7 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial)
 
 	key = 0xff;
 	while (key) {
-		if (serial_read(serial, &key, 1) != 1 || key == 0x00)
+		if (serial_read_blocking(serial, &key, 1) != 1 || key == 0x00)
 			break;
 		type = key >> 5;
 		token = key & 0x1f;
@@ -183,7 +184,7 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial)
 		case 0:
 			/* NULL-terminated string */
 			tmp_str = g_string_new("");
-			while (serial_read(serial, &tmp_c, 1) == 1 && tmp_c != '\0')
+			while (serial_read_blocking(serial, &tmp_c, 1) == 1 && tmp_c != '\0')
 				g_string_append_c(tmp_str, tmp_c);
 			sr_dbg("Got metadata key 0x%.2x value '%s'.",
 			       key, tmp_str->str);
@@ -215,7 +216,7 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial)
 			break;
 		case 1:
 			/* 32-bit unsigned integer */
-			if (serial_read(serial, &tmp_int, 4) != 4)
+			if (serial_read_blocking(serial, &tmp_int, 4) != 4)
 				break;
 			tmp_int = reverse32(tmp_int);
 			sr_dbg("Got metadata key 0x%.2x value 0x%.8x.",
@@ -254,7 +255,7 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial)
 			break;
 		case 2:
 			/* 8-bit unsigned integer */
-			if (serial_read(serial, &tmp_c, 1) != 1)
+			if (serial_read_blocking(serial, &tmp_c, 1) != 1)
 				break;
 			sr_dbg("Got metadata key 0x%.2x value 0x%.2x.",
 			       key, tmp_c);
@@ -354,6 +355,7 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data)
 	int num_channels, offset, j;
 	unsigned int i;
 	unsigned char byte;
+	int serial_fd;
 
 	drvc = di->priv;
 
@@ -363,7 +365,8 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data)
 		sdi = l->data;
 		devc = sdi->priv;
 		serial = sdi->conn;
-		if (serial->fd == fd)
+		sp_get_port_handle(serial->data, &serial_fd);
+		if (serial_fd == fd)
 			break;
 		devc = NULL;
 	}
@@ -378,8 +381,8 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data)
 		 * longer than it takes to send a byte, that means it's
 		 * finished. We'll double that to 30ms to be sure...
 		 */
-		sr_source_remove(fd);
-		sr_source_add(fd, G_IO_IN, 30, ols_receive_data, cb_data);
+		serial_source_remove(serial);
+		serial_source_add(serial, G_IO_IN, 30, ols_receive_data, cb_data);
 		devc->raw_sample_buf = g_try_malloc(devc->limit_samples * 4);
 		if (!devc->raw_sample_buf) {
 			sr_err("Sample buffer malloc failed.");
@@ -398,7 +401,7 @@ SR_PRIV int ols_receive_data(int fd, int revents, void *cb_data)
 	}
 
 	if (revents == G_IO_IN && devc->num_samples < devc->limit_samples) {
-		if (serial_read(serial, &byte, 1) != 1)
+		if (serial_read_nonblocking(serial, &byte, 1) != 1)
 			return FALSE;
 
 		/* Ignore it if we've read enough. */