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

mic-985xx: 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:53:39 +02:00 committed by Uwe Hermann
parent 45b75c368f
commit 301090aa58
3 changed files with 6 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/hardware/mic-985xx/api.c
View File

@ -90,6 +90,7 @@ static GSList *mic_scan(const char *conn, const char *serialcomm, int idx)
sdi->vendor = g_strdup(mic_devs[idx].vendor); sdi->vendor = g_strdup(mic_devs[idx].vendor);
sdi->model = g_strdup(mic_devs[idx].device); sdi->model = g_strdup(mic_devs[idx].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;
@ -152,18 +153,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
devc = sdi->priv; devc = sdi->priv;
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,9 +196,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, int idx)
return SR_ERR_DEV_CLOSED; return SR_ERR_DEV_CLOSED;
devc = sdi->priv; devc = sdi->priv;
devc->num_samples = 0;
devc->starttime = g_get_monotonic_time();
sr_sw_limits_acquisition_start(&devc->limits);
std_session_send_df_header(sdi, LOG_PREFIX); std_session_send_df_header(sdi, LOG_PREFIX);
/* Poll every 100ms, or whenever some data comes in. */ /* Poll every 100ms, or whenever some data comes in. */

17
src/hardware/mic-985xx/protocol.c
View File

@ -142,7 +142,7 @@ static int handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi, int idx)
g_slist_free(l); g_slist_free(l);
} }
devc->num_samples++; sr_sw_limits_update_samples_read(&devc->limits, 1);
return SR_OK; return SR_OK;
} }
@ -186,7 +186,6 @@ static int receive_data(int fd, int revents, int idx, void *cb_data)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct dev_context *devc; struct dev_context *devc;
int64_t t;
static gboolean first_time = TRUE; static gboolean first_time = TRUE;
struct sr_serial_dev_inst *serial; struct sr_serial_dev_inst *serial;
@ -211,20 +210,8 @@ static int receive_data(int fd, int revents, int idx, void *cb_data)
} }
} }
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) {
t = (g_get_monotonic_time() - devc->starttime) / 1000;
if (t > (int64_t)devc->limit_msec) {
sr_info("Requested time limit reached.");
sdi->driver->dev_acquisition_stop(sdi);
return TRUE;
}
}
return TRUE; return TRUE;
} }

11
src/hardware/mic-985xx/protocol.h
View File

@ -54,16 +54,7 @@ extern SR_PRIV const struct mic_dev_info mic_devs[];
/** 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 current sampling limit (in ms). */
uint64_t limit_msec;
/** The current number of already received samples. */
uint64_t num_samples;
int64_t starttime;
uint8_t buf[SERIAL_BUFSIZE]; uint8_t buf[SERIAL_BUFSIZE];
int bufoffset; int bufoffset;