From: lelazary <redacted>
Date: Tue, 8 Jan 2013 16:00:57 +0000 (-0800)
Subject: mso-19: Fixed warning.
X-Git-Tag: dsupstream~260
X-Git-Url: http://sigrok.org/gitweb/?a=commitdiff_plain;h=5952553f569f82b878717b9d97053690014604c9;p=libsigrok.git

mso-19: Fixed warning.
---

diff --git a/hardware/link-mso19/api.c b/hardware/link-mso19/api.c
index 0bc02576..93302655 100644
--- a/hardware/link-mso19/api.c
+++ b/hardware/link-mso19/api.c
@@ -323,8 +323,8 @@ static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 		break;
 	case SR_CONF_LIMIT_SAMPLES:
 		num_samples = *(uint64_t *)value;
-		if (num_samples < 1024) {
-			sr_err("minimum of 1024 samples required");
+		if (num_samples != 1024) {
+			sr_err("Only 1024 samples are supported.");
 			ret = SR_ERR_ARG;
 		} else {
 			devc->limit_samples = num_samples;
diff --git a/hardware/link-mso19/protocol.c b/hardware/link-mso19/protocol.c
index d94e2b6c..d41a9e72 100644
--- a/hardware/link-mso19/protocol.c
+++ b/hardware/link-mso19/protocol.c
@@ -121,7 +121,7 @@ SR_PRIV int mso_configure_trigger(const struct sr_dev_inst *sdi)
 	uint16_t ops[18];
 	ops[0] = mso_trans(3, threshold_value & 0xff);
 	//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[3] = mso_trans(6, devc->la_trigger_mask);
 	ops[4] = mso_trans(7, devc->trigger_holdoff[0]);