X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fcenter-3xx%2Fprotocol.c;h=a67a884f97a7a31c7ffeb4a7b95af7234f93b1e6;hb=ee1b6054d6d6a00698ddae421eae63019c452b6d;hp=34478faeca681c1fcfa7020e179fd8d3b585ebf5;hpb=5faebab2903dc91949edc31f0a4b118d86090a30;p=libsigrok.git

diff --git a/src/hardware/center-3xx/protocol.c b/src/hardware/center-3xx/protocol.c
index 34478fae..a67a884f 100644
--- a/src/hardware/center-3xx/protocol.c
+++ b/src/hardware/center-3xx/protocol.c
@@ -153,11 +153,11 @@ static int handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi, int idx)
 		l = g_slist_append(l, g_slist_nth_data(sdi->channels, i));
 		analog.channels = l;
 		analog.data = &(info.temp[i]);
-		sr_session_send(devc->cb_data, &packet);
+		sr_session_send(sdi, &packet);
 		g_slist_free(l);
 	}
 
-	devc->num_samples++;
+	sr_sw_limits_update_samples_read(&devc->sw_limits, 1);
 
 	return SR_OK;
 }
@@ -205,7 +205,6 @@ static int receive_data(int fd, int revents, int idx, void *cb_data)
 {
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
-	int64_t t;
 	static gboolean request_new_packet = TRUE;
 	struct sr_serial_dev_inst *serial;
 
@@ -233,20 +232,8 @@ static int receive_data(int fd, int revents, int idx, void *cb_data)
 		}
 	}
 
-	if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
-		sr_info("Requested number of samples reached.");
-		sdi->driver->dev_acquisition_stop(sdi, cb_data);
-		return TRUE;
-	}
-
-	if (devc->limit_msec) {
-		t = (g_get_monotonic_time() - devc->starttime) / 1000;
-		if (t > (int64_t)devc->limit_msec) {
-			sr_info("Requested time limit reached.");
-			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;
 }