summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
inline | side by side (from parent 1:
014c7f9)
Use the new software limit helper functions rather than open-coding their
functionality.
This also fixes the issue that the driver does not reset the limit
statistics in acquisition_start(). It also makes the time limit work, which
previously was only a stub implementation.
Signed-off-by: Lars-Peter Clausen <redacted>
sdi->model = g_strdup(tokens[0] + 6);
sdi->version = g_strdup(tokens[1] + s);
devc = g_malloc0(sizeof(struct dev_context));
sdi->model = g_strdup(tokens[0] + 6);
sdi->version = g_strdup(tokens[1] + s);
devc = g_malloc0(sizeof(struct dev_context));
+ sr_sw_limits_init(&devc->limits);
devc->profile = &supported_flukedmm[i];
sdi->inst_type = SR_INST_SERIAL;
sdi->conn = serial;
devc->profile = &supported_flukedmm[i];
sdi->inst_type = SR_INST_SERIAL;
sdi->conn = serial;
- switch (key) {
- case SR_CONF_LIMIT_MSEC:
- /* TODO: not yet implemented */
- devc->limit_msec = g_variant_get_uint64(data);
- break;
- case SR_CONF_LIMIT_SAMPLES:
- devc->limit_samples = g_variant_get_uint64(data);
- break;
- default:
- return SR_ERR_NA;
- }
-
- return SR_OK;
+ return sr_sw_limits_config_set(&devc->limits, key, data);
}
static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
}
static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
+ sr_sw_limits_acquisition_start(&devc->limits);
std_session_send_df_header(sdi, LOG_PREFIX);
/* Poll every 100ms, or whenever some data comes in. */
std_session_send_df_header(sdi, LOG_PREFIX);
/* Poll every 100ms, or whenever some data comes in. */
/* Private, per-device-instance driver context. */
struct dev_context {
const struct flukedmm_profile *profile;
/* Private, per-device-instance driver context. */
struct dev_context {
const struct flukedmm_profile *profile;
- uint64_t limit_samples;
- uint64_t limit_msec;
+ struct sr_sw_limits limits;
char buf[FLUKEDMM_BUFSIZE];
int buflen;
int64_t cmd_sent_at;
char buf[FLUKEDMM_BUFSIZE];
int buflen;
int64_t cmd_sent_at;
packet.type = SR_DF_ANALOG_OLD;
packet.payload = &analog;
sr_session_send(sdi, &packet);
packet.type = SR_DF_ANALOG_OLD;
packet.payload = &analog;
sr_session_send(sdi, &packet);
+ sr_sw_limits_update_samples_read(&devc->limits, 1);
}
static void handle_line(const struct sr_dev_inst *sdi)
}
static void handle_line(const struct sr_dev_inst *sdi)
packet.type = SR_DF_ANALOG_OLD;
packet.payload = analog;
sr_session_send(sdi, &packet);
packet.type = SR_DF_ANALOG_OLD;
packet.payload = analog;
sr_session_send(sdi, &packet);
+ sr_sw_limits_update_samples_read(&devc->limits, 1);
g_free(analog->data);
g_free(analog);
}
g_free(analog->data);
g_free(analog);
}
- if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
+ if (sr_sw_limits_check(&devc->limits)) {
sdi->driver->dev_acquisition_stop(sdi);
return TRUE;
}
sdi->driver->dev_acquisition_stop(sdi);
return TRUE;
}