BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

serial-dmm: Use software limit helpers 

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
This commit is contained in:
Lars-Peter Clausen 2016-05-01 13:54:14 +02:00 committed by Uwe Hermann
parent 37dbffd15d
commit 9f51c463d1
3 changed files with 6 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/hardware/serial-dmm/api.c
View File

@ -131,6 +131,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
sdi->vendor = g_strdup(dmm->vendor); sdi->vendor = g_strdup(dmm->vendor);
sdi->model = g_strdup(dmm->device); sdi->model = g_strdup(dmm->device);
devc = g_malloc0(sizeof(struct dev_context)); devc = g_malloc0(sizeof(struct dev_context));
sr_sw_limits_init(&devc->limits);
sdi->inst_type = SR_INST_SERIAL; sdi->inst_type = SR_INST_SERIAL;
sdi->conn = serial; sdi->conn = serial;
sdi->priv = devc; sdi->priv = devc;
@ -160,18 +161,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
return SR_ERR_BUG; return SR_ERR_BUG;
} }
switch (key) { return sr_sw_limits_config_set(&devc->limits, key, data);
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;
} }
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,
@ -206,14 +196,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
devc = sdi->priv; devc = sdi->priv;
/* sr_sw_limits_acquisition_start(&devc->limits);
* Reset the number of samples to take. If we've already collected our
* quota, but we start a new session, and don't reset this, we'll just
* quit without acquiring any new samples.
*/
devc->num_samples = 0;
devc->starttime = g_get_monotonic_time();
std_session_send_df_header(sdi, LOG_PREFIX); std_session_send_df_header(sdi, LOG_PREFIX);
/* Poll every 50ms, or whenever some data comes in. */ /* Poll every 50ms, or whenever some data comes in. */

17
src/hardware/serial-dmm/protocol.c
View File

@ -70,7 +70,7 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
packet.type = SR_DF_ANALOG_OLD; packet.type = SR_DF_ANALOG_OLD;
packet.payload = &analog; packet.payload = &analog;
sr_session_send(sdi, &packet); sr_session_send(sdi, &packet);
devc->num_samples++; sr_sw_limits_update_samples_read(&devc->limits, 1);
} }
} }
@ -160,7 +160,6 @@ int receive_data(int fd, int revents, void *cb_data)
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct dev_context *devc; struct dev_context *devc;
struct dmm_info *dmm; struct dmm_info *dmm;
int64_t time;
void *info; void *info;
(void)fd; (void)fd;
@ -184,20 +183,8 @@ int receive_data(int fd, int revents, void *cb_data)
return FALSE; return FALSE;
} }
if (devc->limit_samples && devc->num_samples >= devc->limit_samples) { if (sr_sw_limits_check(&devc->limits))
sr_info("Requested number of samples reached.");
sdi->driver->dev_acquisition_stop(sdi); sdi->driver->dev_acquisition_stop(sdi);
return TRUE;
}
if (devc->limit_msec) {
time = (g_get_monotonic_time() - devc->starttime) / 1000;
if (time > (int64_t)devc->limit_msec) {
sr_info("Requested time limit reached.");
sdi->driver->dev_acquisition_stop(sdi);
return TRUE;
}
}
return TRUE; return TRUE;
} }

12
src/hardware/serial-dmm/protocol.h
View File

@ -58,17 +58,7 @@ struct dmm_info {
/** Private, per-device-instance driver context. */ /** Private, per-device-instance driver context. */
struct dev_context { struct dev_context {
/** The current sampling limit (in number of samples). */ struct sr_sw_limits limits;
uint64_t limit_samples;
/** The time limit (in milliseconds). */
uint64_t limit_msec;
/** The current number of already received samples. */
uint64_t num_samples;
/** The starting time of current sampling run. */
int64_t starttime;
uint8_t buf[DMM_BUFSIZE]; uint8_t buf[DMM_BUFSIZE];
int bufoffset; int bufoffset;