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

mso-19: Fixed warning.

This commit is contained in:
lelazary 2013-01-08 08:00:57 -08:00 committed by Uwe Hermann
parent 07e1aad5c4
commit 5952553f56
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hardware/link-mso19/api.c
View File

@ -323,8 +323,8 @@ static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
break; break;
case SR_CONF_LIMIT_SAMPLES: case SR_CONF_LIMIT_SAMPLES:
num_samples = *(uint64_t *)value; num_samples = *(uint64_t *)value;
if (num_samples < 1024) { if (num_samples != 1024) {
sr_err("minimum of 1024 samples required"); sr_err("Only 1024 samples are supported.");
ret = SR_ERR_ARG; ret = SR_ERR_ARG;
} else { } else {
devc->limit_samples = num_samples; devc->limit_samples = num_samples;

2
hardware/link-mso19/protocol.c
View File

@ -121,7 +121,7 @@ SR_PRIV int mso_configure_trigger(const struct sr_dev_inst *sdi)
uint16_t ops[18]; uint16_t ops[18];
ops[0] = mso_trans(3, threshold_value & 0xff); ops[0] = mso_trans(3, threshold_value & 0xff);
//The trigger_config also holds the 2 MSB bits from the threshold value //The trigger_config also holds the 2 MSB bits from the threshold value
ops[1] = mso_trans(4, trigger_config | (threshold_value >> 8) & 0x03); ops[1] = mso_trans(4, trigger_config | ((threshold_value >> 8) & 0x03));
ops[2] = mso_trans(5, devc->la_trigger); ops[2] = mso_trans(5, devc->la_trigger);
ops[3] = mso_trans(6, devc->la_trigger_mask); ops[3] = mso_trans(6, devc->la_trigger_mask);
ops[4] = mso_trans(7, devc->trigger_holdoff[0]); ops[4] = mso_trans(7, devc->trigger_holdoff[0]);