X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fopenbench-logic-sniffer%2Fprotocol.c;h=c2b66615e5156781163d9ca02de723d11a018598;hb=0af636bed97c174bea46e61e961eaa1b0b162e0f;hp=3d5ee6e2691da40d50f7ec448d920c53b2ad895c;hpb=eead2782427ee5da9b793527f9484ac827a7bec5;p=libsigrok.git

diff --git a/src/hardware/openbench-logic-sniffer/protocol.c b/src/hardware/openbench-logic-sniffer/protocol.c
index 3d5ee6e2..c2b66615 100644
--- a/src/hardware/openbench-logic-sniffer/protocol.c
+++ b/src/hardware/openbench-logic-sniffer/protocol.c
@@ -30,7 +30,10 @@ SR_PRIV int send_shortcommand(struct sr_serial_dev_inst *serial,
 
 	sr_dbg("Sending cmd 0x%.2x.", command);
 	buf[0] = command;
-	if (serial_write_blocking(serial, buf, 1, 0) != 1)
+	if (serial_write_blocking(serial, buf, 1, serial_timeout(serial, 1)) != 1)
+		return SR_ERR;
+
+	if (serial_drain(serial) != 0)
 		return SR_ERR;
 
 	return SR_OK;
@@ -48,7 +51,10 @@ SR_PRIV int send_longcommand(struct sr_serial_dev_inst *serial,
 	buf[2] = data[1];
 	buf[3] = data[2];
 	buf[4] = data[3];
-	if (serial_write_blocking(serial, buf, 5, 0) != 5)
+	if (serial_write_blocking(serial, buf, 5, serial_timeout(serial, 1)) != 5)
+		return SR_ERR;
+
+	if (serial_drain(serial) != 0)
 		return SR_ERR;
 
 	return SR_OK;
@@ -142,10 +148,12 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial)
 	struct sr_channel *ch;
 	uint32_t tmp_int, ui;
 	uint8_t key, type, token;
+	int delay_ms;
 	GString *tmp_str, *devname, *version;
 	guchar tmp_c;
 
-	sdi = sr_dev_inst_new(SR_ST_INACTIVE, NULL, NULL, NULL);
+	sdi = sr_dev_inst_new();
+	sdi->status = SR_ST_INACTIVE;
 	sdi->driver = di;
 	devc = ols_dev_new();
 	sdi->priv = devc;
@@ -155,7 +163,8 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial)
 
 	key = 0xff;
 	while (key) {
-		if (serial_read_blocking(serial, &key, 1, 0) != 1)
+		delay_ms = serial_timeout(serial, 1);
+		if (serial_read_blocking(serial, &key, 1, delay_ms) != 1)
 			break;
 		if (key == 0x00) {
 			sr_dbg("Got metadata key 0x00, metadata ends.");
@@ -167,7 +176,8 @@ 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_blocking(serial, &tmp_c, 1, 0) == 1 && tmp_c != '\0')
+			delay_ms = serial_timeout(serial, 1);
+			while (serial_read_blocking(serial, &tmp_c, 1, delay_ms) == 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);
@@ -199,7 +209,8 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial)
 			break;
 		case 1:
 			/* 32-bit unsigned integer */
-			if (serial_read_blocking(serial, &tmp_int, 4, 0) != 4)
+			delay_ms = serial_timeout(serial, 4);
+			if (serial_read_blocking(serial, &tmp_int, 4, delay_ms) != 4)
 				break;
 			tmp_int = RB32(&tmp_int);
 			sr_dbg("Got metadata key 0x%.2x value 0x%.8x.",
@@ -238,7 +249,8 @@ SR_PRIV struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial)
 			break;
 		case 2:
 			/* 8-bit unsigned integer */
-			if (serial_read_blocking(serial, &tmp_c, 1, 0) != 1)
+			delay_ms = serial_timeout(serial, 1);
+			if (serial_read_blocking(serial, &tmp_c, 1, delay_ms) != 1)
 				break;
 			sr_dbg("Got metadata key 0x%.2x value 0x%.2x.",
 			       key, tmp_c);