X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fappa-55ii%2Fprotocol.c;h=4720fd4f24d11b5c0e3b660e58229713919cdb21;hb=dd5c48a6d567a3cac62c4b0058588273bbeea171;hp=257f60577e99c2c443f49e41f9c8bf5914a5a2b8;hpb=695dc859c15ba4190f5c1aa2e1a6e2dc6a6e5845;p=libsigrok.git

diff --git a/src/hardware/appa-55ii/protocol.c b/src/hardware/appa-55ii/protocol.c
index 257f6057..4720fd4f 100644
--- a/src/hardware/appa-55ii/protocol.c
+++ b/src/hardware/appa-55ii/protocol.c
@@ -123,7 +123,7 @@ static void appa_55ii_live_data(struct sr_dev_inst *sdi, const uint8_t *buf)
 	sr_session_send(sdi, &packet);
 	g_slist_free(analog.channels);
 
-	devc->num_samples++;
+	sr_sw_limits_update_samples_read(&devc->limits, 1);
 }
 
 static void appa_55ii_log_metadata(struct sr_dev_inst *sdi, const uint8_t *buf)
@@ -175,7 +175,7 @@ static void appa_55ii_log_data_parse(struct sr_dev_inst *sdi)
 		sr_session_send(sdi, &packet);
 		g_slist_free(analog.channels);
 
-		devc->num_samples++;
+		sr_sw_limits_update_samples_read(&devc->limits, 1);
 		devc->log_buf_len -= 20;
 		offset += 20;
 		devc->num_log_records--;
@@ -266,7 +266,6 @@ SR_PRIV int appa_55ii_receive_data(int fd, int revents, void *cb_data)
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
 	struct sr_serial_dev_inst *serial;
-	int64_t time;
 	const uint8_t *ptr, *next_ptr, *end_ptr;
 	int len;
 
@@ -301,20 +300,10 @@ SR_PRIV int appa_55ii_receive_data(int fd, int revents, void *cb_data)
 		return FALSE;
 	}
 
-	if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
-		sr_info("Requested number of samples reached.");
+	if (sr_sw_limits_check(&devc->limits)) {
 		sdi->driver->dev_acquisition_stop(sdi);
 		return TRUE;
 	}
 
-	if (devc->limit_msec) {
-		time = (g_get_monotonic_time() - devc->start_time) / 1000;
-		if (time > (int64_t)devc->limit_msec) {
-			sr_info("Requested time limit reached.");
-			sdi->driver->dev_acquisition_stop(sdi);
-			return TRUE;
-		}
-	}
-
 	return TRUE;
 }