X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Flcr%2Fes51919.c;h=d7290c76dafcec6a191be7fe75a37010a179f37c;hb=ca1c21ca3e603b4f383e56ddebbafaa73d89f894;hp=b1b788531a4077c2d7aedccad5c54e16b55e24f0;hpb=a6413fa58e455fb4a654720218183e297835226c;p=libsigrok.git

diff --git a/src/lcr/es51919.c b/src/lcr/es51919.c
index b1b78853..d7290c76 100644
--- a/src/lcr/es51919.c
+++ b/src/lcr/es51919.c
@@ -100,32 +100,33 @@ static uint8_t *dev_buffer_packet_find(struct dev_buffer *dbuf,
 	return NULL;
 }
 
-struct dev_sample_counter {
-	/** The current number of already received samples. */
+struct dev_limit_counter {
+	/** The current number of received samples/frames/etc. */
 	uint64_t count;
-	/** The current sampling limit (in number of samples). */
+	/** The limit (in number of samples/frames/etc.). */
 	uint64_t limit;
 };
 
-static void dev_sample_counter_start(struct dev_sample_counter *cnt)
+static void dev_limit_counter_start(struct dev_limit_counter *cnt)
 {
 	cnt->count = 0;
 }
 
-static void dev_sample_counter_inc(struct dev_sample_counter *cnt)
+static void dev_limit_counter_inc(struct dev_limit_counter *cnt)
 {
 	cnt->count++;
 }
 
-static void dev_sample_limit_set(struct dev_sample_counter *cnt, uint64_t limit)
+static void dev_limit_counter_limit_set(struct dev_limit_counter *cnt,
+					uint64_t limit)
 {
 	cnt->limit = limit;
 }
 
-static gboolean dev_sample_limit_reached(struct dev_sample_counter *cnt)
+static gboolean dev_limit_counter_limit_reached(struct dev_limit_counter *cnt)
 {
 	if (cnt->limit && cnt->count >= cnt->limit) {
-		sr_info("Requested sample limit reached.");
+		sr_info("Requested counter limit reached.");
 		return TRUE;
 	}
 
@@ -304,7 +305,6 @@ static int send_config_update_key(struct sr_dev_inst *sdi, uint32_t key,
 	sr_config_free(cfg);
 
 	return ret;
-
 }
 
 /*
@@ -431,8 +431,8 @@ struct dev_context {
 	/** Opaque pointer passed in by the frontend. */
 	void *cb_data;
 
-	/** The number of samples. */
-	struct dev_sample_counter sample_count;
+	/** The number of frames. */
+	struct dev_limit_counter frame_count;
 
 	/** The time limit counter. */
 	struct dev_time_counter time_count;
@@ -466,7 +466,7 @@ static int parse_mq(const uint8_t *pkt, int is_secondary, int is_parallel)
 
 	switch (is_secondary << 8 | buf[0]) {
 	case 0x001:
-	        return is_parallel ?
+		return is_parallel ?
 			SR_MQ_PARALLEL_INDUCTANCE : SR_MQ_SERIES_INDUCTANCE;
 	case 0x002:
 		return is_parallel ?
@@ -606,7 +606,6 @@ static unsigned int parse_model(const uint8_t *pkt)
 		return MODEL_PAR;
 	else
 		return MODEL_SER;
-
 }
 
 static gboolean packet_valid(const uint8_t *pkt)
@@ -743,7 +742,7 @@ static void handle_packet(struct sr_dev_inst *sdi, const uint8_t *pkt)
 	if (frame) {
 		packet.type = SR_DF_FRAME_END;
 		sr_session_send(devc->cb_data, &packet);
-		dev_sample_counter_inc(&devc->sample_count);
+		dev_limit_counter_inc(&devc->frame_count);
 	}
 }
 
@@ -784,23 +783,13 @@ static int receive_data(int fd, int revents, void *cb_data)
 		handle_new_data(sdi);
 	}
 
-	if (dev_sample_limit_reached(&devc->sample_count) ||
+	if (dev_limit_counter_limit_reached(&devc->frame_count) ||
 	    dev_time_limit_reached(&devc->time_count))
 		sdi->driver->dev_acquisition_stop(sdi, cb_data);
 
 	return TRUE;
 }
 
-static int add_channel(struct sr_dev_inst *sdi, int idx, const char *name)
-{
-	struct sr_channel *ch;
-
-	ch = sr_channel_new(idx, SR_CHANNEL_ANALOG, TRUE, name);
-	sdi->channels = g_slist_append(sdi->channels, ch);
-
-	return SR_OK;
-}
-
 static const char *const channel_names[] = { "P1", "P2" };
 
 static int setup_channels(struct sr_dev_inst *sdi)
@@ -810,11 +799,8 @@ static int setup_channels(struct sr_dev_inst *sdi)
 
 	ret = SR_ERR_BUG;
 
-	for (i = 0; i < ARRAY_SIZE(channel_names); i++) {
-		ret = add_channel(sdi, i, channel_names[i]);
-		if (ret != SR_OK)
-			break;
-	}
+	for (i = 0; i < ARRAY_SIZE(channel_names); i++)
+		sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, channel_names[i]);
 
 	return ret;
 }
@@ -928,10 +914,10 @@ SR_PRIV int es51919_serial_config_set(uint32_t key, GVariant *data,
 		dev_time_limit_set(&devc->time_count, val);
 		sr_dbg("Setting time limit to %" PRIu64 ".", val);
 		break;
-	case SR_CONF_LIMIT_SAMPLES:
+	case SR_CONF_LIMIT_FRAMES:
 		val = g_variant_get_uint64(data);
-		dev_sample_limit_set(&devc->sample_count, val);
-		sr_dbg("Setting sample limit to %" PRIu64 ".", val);
+		dev_limit_counter_limit_set(&devc->frame_count, val);
+		sr_dbg("Setting frame limit to %" PRIu64 ".", val);
 		break;
 	default:
 		sr_spew("%s: Unsupported key %u", __func__, key);
@@ -949,7 +935,7 @@ static const uint32_t scanopts[] = {
 static const uint32_t devopts[] = {
 	SR_CONF_LCRMETER,
 	SR_CONF_CONTINUOUS,
-	SR_CONF_LIMIT_SAMPLES | SR_CONF_SET,
+	SR_CONF_LIMIT_FRAMES | SR_CONF_SET,
 	SR_CONF_LIMIT_MSEC | SR_CONF_SET,
 	SR_CONF_OUTPUT_FREQUENCY | SR_CONF_GET | SR_CONF_LIST,
 	SR_CONF_MEASURED_QUANTITY | SR_CONF_GET | SR_CONF_LIST,
@@ -1010,7 +996,7 @@ SR_PRIV int es51919_serial_acquisition_start(const struct sr_dev_inst *sdi,
 
 	devc->cb_data = cb_data;
 
-	dev_sample_counter_start(&devc->sample_count);
+	dev_limit_counter_start(&devc->frame_count);
 	dev_time_counter_start(&devc->time_count);
 
 	/* Send header packet to the session bus. */