X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fserial-lcr%2Fprotocol.c;h=e7b2612f56661ed0976f6d4cacc4a2374e740d78;hb=599f9e1deb6b6a4a75e00e29d86935845164eeed;hp=645769724bb1a4b8d4e81d6ab1a60aae873867ef;hpb=92499a9c78b63e6a93d67de1883180d40fee7739;p=libsigrok.git

diff --git a/src/hardware/serial-lcr/protocol.c b/src/hardware/serial-lcr/protocol.c
index 64576972..e7b2612f 100644
--- a/src/hardware/serial-lcr/protocol.c
+++ b/src/hardware/serial-lcr/protocol.c
@@ -148,10 +148,42 @@ static int handle_new_data(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
+static int handle_timeout(struct sr_dev_inst *sdi)
+{
+	struct dev_context *devc;
+	const struct lcr_info *lcr;
+	struct sr_serial_dev_inst *serial;
+	int64_t now;
+	int ret;
+
+	devc = sdi->priv;
+	lcr = devc->lcr_info;
+
+	if (!lcr->packet_request)
+		return SR_OK;
+
+	now = g_get_monotonic_time();
+	if (devc->req_next_at && now < devc->req_next_at)
+		return SR_OK;
+
+	serial = sdi->conn;
+	ret = lcr->packet_request(serial);
+	if (ret < 0) {
+		sr_err("Failed to request packet: %d.", ret);
+		return ret;
+	}
+
+	if (lcr->req_timeout_ms)
+		devc->req_next_at = now + lcr->req_timeout_ms * 1000;
+
+	return SR_OK;
+}
+
 SR_PRIV int lcr_receive_data(int fd, int revents, void *cb_data)
 {
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
+	int ret;
 
 	(void)fd;
 
@@ -161,10 +193,13 @@ SR_PRIV int lcr_receive_data(int fd, int revents, void *cb_data)
 		return TRUE;
 
 	if (revents == G_IO_IN)
-		handle_new_data(sdi);
-
+		ret = handle_new_data(sdi);
+	else
+		ret = handle_timeout(sdi);
 	if (sr_sw_limits_check(&devc->limits))
 		sr_dev_acquisition_stop(sdi);
+	if (ret != SR_OK)
+		return FALSE;
 
 	return TRUE;
 }