From: Bert Vermeulen <redacted>
Date: Sun, 5 Oct 2014 10:29:28 +0000 (+0200)
Subject: atten-pps3xxx: Fix serial port timeout.
X-Git-Tag: libsigrok-0.4.0~886
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=945cfd4fdd3d2aa2758e1957c7c4c1440badcf8b;p=libsigrok.git

atten-pps3xxx: Fix serial port timeout.
---

diff --git a/src/hardware/atten-pps3xxx/api.c b/src/hardware/atten-pps3xxx/api.c
index 24b392ee..68dec6b0 100644
--- a/src/hardware/atten-pps3xxx/api.c
+++ b/src/hardware/atten-pps3xxx/api.c
@@ -92,6 +92,7 @@ static GSList *scan(GSList *options, int modelid)
 	struct sr_serial_dev_inst *serial;
 	GSList *l, *devices;
 	struct pps_model *model;
+	float byte_delay_ms;
 	uint8_t packet[PACKET_SIZE];
 	unsigned int i;
 	int ret;
@@ -126,11 +127,20 @@ static GSList *scan(GSList *options, int modelid)
 		return NULL;
 	serial_flush(serial);
 
-	/* This is how the vendor software channels for hardware. */
+	/* How long it takes for a byte to transfer over the serial port. */
+	if (sp_get_port_transport(serial->data) == SP_TRANSPORT_NATIVE)
+		/* 11 bits at 9600 bps. */
+		byte_delay_ms = 1.15;
+	else
+		/* Emulated serial over USB or bluetooth is just enqueueing. */
+		byte_delay_ms = 0;
+
+	/* This is how the vendor software scans for hardware. */
 	memset(packet, 0, PACKET_SIZE);
 	packet[0] = 0xaa;
 	packet[1] = 0xaa;
-	if (serial_write_blocking(serial, packet, PACKET_SIZE, 0) < PACKET_SIZE) {
+	if (serial_write_blocking(serial, packet, PACKET_SIZE,
+			byte_delay_ms * PACKET_SIZE + 1) < PACKET_SIZE) {
 		sr_err("Unable to write while probing for hardware.");
 		return NULL;
 	}
@@ -178,6 +188,7 @@ static GSList *scan(GSList *options, int modelid)
 	devc = g_malloc0(sizeof(struct dev_context));
 	devc->model = model;
 	devc->config = g_malloc0(sizeof(struct per_channel_config) * model->num_channels);
+	devc->byte_delay_ms = byte_delay_ms;
 	sdi->priv = devc;
 	drvc->instances = g_slist_append(drvc->instances, sdi);
 	devices = g_slist_append(devices, sdi);
diff --git a/src/hardware/atten-pps3xxx/protocol.c b/src/hardware/atten-pps3xxx/protocol.c
index 0db7e232..98838b65 100644
--- a/src/hardware/atten-pps3xxx/protocol.c
+++ b/src/hardware/atten-pps3xxx/protocol.c
@@ -83,10 +83,13 @@ static void handle_packet(const struct sr_dev_inst *sdi)
 
 SR_PRIV void send_packet(const struct sr_dev_inst *sdi, uint8_t *packet)
 {
+	struct dev_context *devc;
 	struct sr_serial_dev_inst *serial;
 
+	devc = sdi->priv;
 	serial = sdi->conn;
-	if (serial_write_blocking(serial, packet, PACKET_SIZE, 0) < PACKET_SIZE)
+	if (serial_write_blocking(serial, packet, PACKET_SIZE,
+			devc->byte_delay_ms * PACKET_SIZE + 1) < PACKET_SIZE)
 		sr_dbg("Failed to send packet.");
 	dump_packet("sent", packet);
 }
diff --git a/src/hardware/atten-pps3xxx/protocol.h b/src/hardware/atten-pps3xxx/protocol.h
index 1441305d..2ad9e857 100644
--- a/src/hardware/atten-pps3xxx/protocol.h
+++ b/src/hardware/atten-pps3xxx/protocol.h
@@ -82,6 +82,7 @@ struct dev_context {
 	/* Operational state */
 	gboolean config_dirty;
 	struct per_channel_config *config;
+	float byte_delay_ms;
 	/* Received from device. */
 	int channel_mode;
 	gboolean over_current_protection;