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

asix-sigma: Don't set invalid configuration options.

This commit is contained in:
Bert Vermeulen 2014-05-04 11:48:17 -07:00
parent f055494660
commit 6b2d33856f
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
hardware/asix-sigma/asix-sigma.c
View File

@ -682,20 +682,20 @@ static int set_samplerate(const struct sr_dev_inst *sdi, uint64_t samplerate)
if (samplerate <= SR_MHZ(50)) { if (samplerate <= SR_MHZ(50)) {
ret = upload_firmware(0, devc); ret = upload_firmware(0, devc);
devc->num_channels = 16; devc->num_channels = 16;
} } else if (samplerate == SR_MHZ(100)) {
if (samplerate == SR_MHZ(100)) {
ret = upload_firmware(1, devc); ret = upload_firmware(1, devc);
devc->num_channels = 8; devc->num_channels = 8;
} } else if (samplerate == SR_MHZ(200)) {
else if (samplerate == SR_MHZ(200)) {
ret = upload_firmware(2, devc); ret = upload_firmware(2, devc);
devc->num_channels = 4; devc->num_channels = 4;
} }
devc->cur_samplerate = samplerate; if (ret == SR_OK) {
devc->period_ps = 1000000000000ULL / samplerate; devc->cur_samplerate = samplerate;
devc->samples_per_event = 16 / devc->num_channels; devc->period_ps = 1000000000000ULL / samplerate;
devc->state.state = SIGMA_IDLE; devc->samples_per_event = 16 / devc->num_channels;
devc->state.state = SIGMA_IDLE;
}
return ret; return ret;
} }
@ -833,8 +833,8 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg) const struct sr_channel_group *cg)
{ {
struct dev_context *devc; struct dev_context *devc;
uint64_t num_samples; uint64_t tmp;
int ret = 0; int ret;
(void)cg; (void)cg;
@ -843,27 +843,28 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
devc = sdi->priv; devc = sdi->priv;
ret = SR_OK;
switch (id) { switch (id) {
case SR_CONF_SAMPLERATE: case SR_CONF_SAMPLERATE:
ret = set_samplerate(sdi, g_variant_get_uint64(data)); ret = set_samplerate(sdi, g_variant_get_uint64(data));
break; break;
case SR_CONF_LIMIT_MSEC: case SR_CONF_LIMIT_MSEC:
devc->limit_msec = g_variant_get_uint64(data); tmp = g_variant_get_uint64(data);
if (devc->limit_msec > 0) if (tmp > 0)
ret = SR_OK; devc->limit_msec = g_variant_get_uint64(data);
else else
ret = SR_ERR; ret = SR_ERR;
break; break;
case SR_CONF_LIMIT_SAMPLES: case SR_CONF_LIMIT_SAMPLES:
num_samples = g_variant_get_uint64(data); tmp = g_variant_get_uint64(data);
devc->limit_msec = num_samples * 1000 / devc->cur_samplerate; devc->limit_msec = tmp * 1000 / devc->cur_samplerate;
break; break;
case SR_CONF_CAPTURE_RATIO: case SR_CONF_CAPTURE_RATIO:
devc->capture_ratio = g_variant_get_uint64(data); tmp = g_variant_get_uint64(data);
if (devc->capture_ratio < 0 || devc->capture_ratio > 100) if (tmp <= 100)
ret = SR_ERR; devc->capture_ratio = tmp;
else else
ret = SR_OK; ret = SR_ERR;
break; break;
default: default:
ret = SR_ERR_NA; ret = SR_ERR_NA;