X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbrymen-dmm%2Fprotocol.c;h=3e1b84c421834030b777fe1b9fd7ee347bbd5e2f;hb=45884333ff8641c86d9808b46dde9f571083c10d;hp=07ac19394a674579dbe7d7993d3aba7c20bf4cea;hpb=0c5f2abc6697504b5d760dfa56cc90bea180198f;p=libsigrok.git

diff --git a/src/hardware/brymen-dmm/protocol.c b/src/hardware/brymen-dmm/protocol.c
index 07ac1939..3e1b84c4 100644
--- a/src/hardware/brymen-dmm/protocol.c
+++ b/src/hardware/brymen-dmm/protocol.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include "protocol.h"
 
 static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi)
@@ -24,7 +25,7 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi)
 	float floatval;
 	struct dev_context *devc;
 	struct sr_datafeed_packet packet;
-	struct sr_datafeed_analog analog;
+	struct sr_datafeed_analog_old analog;
 
 	devc = sdi->priv;
 
@@ -39,10 +40,10 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi)
 
 	if (analog.mq != -1) {
 		/* Got a measurement. */
-		packet.type = SR_DF_ANALOG;
+		packet.type = SR_DF_ANALOG_OLD;
 		packet.payload = &analog;
-		sr_session_send(devc->cb_data, &packet);
-		devc->num_samples++;
+		sr_session_send(sdi, &packet);
+		sr_sw_limits_update_samples_read(&devc->sw_limits, 1);
 	}
 }
 
@@ -113,7 +114,6 @@ SR_PRIV int brymen_dmm_receive_data(int fd, int revents, void *cb_data)
 	struct dev_context *devc;
 	struct sr_serial_dev_inst *serial;
 	int ret;
-	int64_t time;
 
 	(void)fd;
 
@@ -136,20 +136,8 @@ SR_PRIV int brymen_dmm_receive_data(int fd, int revents, void *cb_data)
 		}
 	}
 
-	if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
-		sr_info("Requested number of samples reached, stopping.");
-		sdi->driver->dev_acquisition_stop(sdi, cb_data);
-		return TRUE;
-	}
-
-	if (devc->limit_msec) {
-		time = (g_get_monotonic_time() - devc->starttime) / 1000;
-		if (time > (int64_t)devc->limit_msec) {
-			sr_info("Requested time limit reached, stopping.");
-			sdi->driver->dev_acquisition_stop(sdi, cb_data);
-			return TRUE;
-		}
-	}
+	if (sr_sw_limits_check(&devc->sw_limits))
+		sdi->driver->dev_acquisition_stop(sdi);
 
 	return TRUE;
 }
@@ -179,7 +167,9 @@ SR_PRIV int brymen_stream_detect(struct sr_serial_dev_inst *serial,
 {
 	int64_t start, time, byte_delay_us;
 	size_t ibuf, i, maxlen;
-	int status, len, packet_len, stream_len;
+	ssize_t len, stream_len;
+	int packet_len;
+	int status;
 
 	maxlen = *buflen;
 
@@ -187,7 +177,7 @@ SR_PRIV int brymen_stream_detect(struct sr_serial_dev_inst *serial,
 	       "ms, baudrate = %d).", serial->port, timeout_ms, baudrate);
 
 	/* Assume 8n1 transmission. That is 10 bits for every byte. */
-	byte_delay_us = 10 * (1000000 / baudrate);
+	byte_delay_us = 10 * ((1000 * 1000) / baudrate);
 	start = g_get_monotonic_time();
 
 	packet_len = i = ibuf = len = 0;
@@ -195,7 +185,7 @@ SR_PRIV int brymen_stream_detect(struct sr_serial_dev_inst *serial,
 		len = serial_read_nonblocking(serial, &buf[ibuf], maxlen - ibuf);
 		if (len > 0) {
 			ibuf += len;
-			sr_spew("Read %d bytes.", len);
+			sr_spew("Read %zd bytes.", len);
 		}
 
 		time = g_get_monotonic_time() - start;
@@ -247,14 +237,14 @@ SR_PRIV int brymen_stream_detect(struct sr_serial_dev_inst *serial,
 
 		if (time >= (int64_t)timeout_ms) {
 			/* Timeout */
-			sr_dbg("Detection timed out after %dms.", time);
+			sr_dbg("Detection timed out after %" PRIi64 "ms.", time);
 			break;
 		}
 		g_usleep(byte_delay_us);
 	}
 
 	*buflen = ibuf;
-	sr_err("Didn't find a valid packet (read %d bytes).", ibuf);
+	sr_err("Didn't find a valid packet (read %zu bytes).", ibuf);
 
 	return SR_ERR;
 }