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;
}
sr_config_free(cfg);
return ret;
-
}
/*
#define PACKET_SIZE 17
-static const uint64_t frequencies[] = {
+static const double frequencies[] = {
100, 120, 1000, 10000, 100000, 0,
};
/** 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;
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 ?
return MODEL_PAR;
else
return MODEL_SER;
-
}
static gboolean packet_valid(const uint8_t *pkt)
static int send_freq_update(struct sr_dev_inst *sdi, unsigned int freq)
{
return do_config_update(sdi, SR_CONF_OUTPUT_FREQUENCY,
- g_variant_new_uint64(frequencies[freq]));
+ g_variant_new_double(frequencies[freq]));
}
static int send_quant1_update(struct sr_dev_inst *sdi, unsigned int quant)
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);
}
}
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)
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;
}
switch (key) {
case SR_CONF_OUTPUT_FREQUENCY:
- *data = g_variant_new_uint64(frequencies[devc->freq]);
+ *data = g_variant_new_double(frequencies[devc->freq]);
break;
case SR_CONF_MEASURED_QUANTITY:
*data = g_variant_new_string(quantities1[devc->quant1]);
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);
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,
switch (key) {
case SR_CONF_OUTPUT_FREQUENCY:
- *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64,
- frequencies, ARRAY_SIZE(frequencies), sizeof(uint64_t));
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_DOUBLE,
+ frequencies, ARRAY_SIZE(frequencies), sizeof(double));
break;
case SR_CONF_MEASURED_QUANTITY:
*data = g_variant_new_strv(list_quantities1,
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. */