From ab939ebba60a18786b91509298bd82f28c4b8fb3 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sun, 1 May 2016 13:51:52 +0200 Subject: [PATCH] brymen-bm86x: Use software limit helpers Signed-off-by: Lars-Peter Clausen --- src/hardware/brymen-bm86x/api.c | 31 ++++++---------------------- src/hardware/brymen-bm86x/protocol.c | 17 ++------------- src/hardware/brymen-bm86x/protocol.h | 5 +---- 3 files changed, 9 insertions(+), 44 deletions(-) diff --git a/src/hardware/brymen-bm86x/api.c b/src/hardware/brymen-bm86x/api.c index 87c328d9..3f270fb0 100644 --- a/src/hardware/brymen-bm86x/api.c +++ b/src/hardware/brymen-bm86x/api.c @@ -85,6 +85,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) sdi->inst_type = SR_INST_USB; sdi->conn = usb; + sr_sw_limits_init(&devc->sw_limits); + drvc->instances = g_slist_append(drvc->instances, sdi); devices = g_slist_append(devices, sdi); } @@ -174,18 +176,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s (void)cg; - switch (key) { - case SR_CONF_LIMIT_SAMPLES: - *data = g_variant_new_uint64(devc->limit_samples); - break; - case SR_CONF_LIMIT_MSEC: - *data = g_variant_new_uint64(devc->limit_msec); - break; - default: - return SR_ERR_NA; - } - - return SR_OK; + return sr_sw_limits_config_get(&devc->sw_limits, key, data); } static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, @@ -203,18 +194,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd return SR_ERR_BUG; } - switch (key) { - case SR_CONF_LIMIT_SAMPLES: - devc->limit_samples = g_variant_get_uint64(data); - break; - case SR_CONF_LIMIT_MSEC: - devc->limit_msec = g_variant_get_uint64(data); - break; - default: - return SR_ERR_NA; - } - - return SR_OK; + return sr_sw_limits_config_set(&devc->sw_limits, key, data); } static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, @@ -247,7 +227,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) return SR_ERR_DEV_CLOSED; devc = sdi->priv; - devc->start_time = g_get_monotonic_time(); + + sr_sw_limits_acquisition_start(&devc->sw_limits); std_session_send_df_header(sdi, LOG_PREFIX); diff --git a/src/hardware/brymen-bm86x/protocol.c b/src/hardware/brymen-bm86x/protocol.c index b2b955f5..a5531109 100644 --- a/src/hardware/brymen-bm86x/protocol.c +++ b/src/hardware/brymen-bm86x/protocol.c @@ -231,7 +231,7 @@ static void brymen_bm86x_handle_packet(const struct sr_dev_inst *sdi, } if (analog[0].mq != -1 || analog[1].mq != -1) - devc->num_samples++; + sr_sw_limits_update_samples_read(&devc->sw_limits, 1); } static int brymen_bm86x_send_command(const struct sr_dev_inst *sdi) @@ -308,7 +308,6 @@ SR_PRIV int brymen_bm86x_receive_data(int fd, int revents, void *cb_data) { struct sr_dev_inst *sdi; struct dev_context *devc; - int64_t time; (void)fd; (void)revents; @@ -328,20 +327,8 @@ SR_PRIV int brymen_bm86x_receive_data(int fd, int revents, void *cb_data) if (brymen_bm86x_read_interrupt(sdi)) return FALSE; - if (devc->limit_samples && devc->num_samples >= devc->limit_samples) { - sr_info("Requested number of samples reached, stopping."); + if (sr_sw_limits_check(&devc->sw_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, stopping."); - sdi->driver->dev_acquisition_stop(sdi); - return TRUE; - } - } return TRUE; } diff --git a/src/hardware/brymen-bm86x/protocol.h b/src/hardware/brymen-bm86x/protocol.h index 6e33e8bd..4cba7674 100644 --- a/src/hardware/brymen-bm86x/protocol.h +++ b/src/hardware/brymen-bm86x/protocol.h @@ -30,13 +30,10 @@ /** Private, per-device-instance driver context. */ struct dev_context { /* Acquisition settings */ - uint64_t limit_samples; /**< The sampling limit (in number of samples).*/ - uint64_t limit_msec; /**< The time limit (in milliseconds). */ + struct sr_sw_limits sw_limits; /* Operational state */ int detached_kernel_driver;/**< Whether kernel driver was detached or not */ - uint64_t num_samples; /**< The number of already received samples. */ - int64_t start_time; /**< The time at which sampling started. */ /* Temporary state across callbacks */ int interrupt_pending;