From: Håvard Espeland <redacted>
Date: Sat, 15 Jan 2011 19:01:00 +0000 (+0100)
Subject: Sigma: Limit number of edge triggers to 1.
X-Git-Tag: libsigrok-0.1.0~423
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=98b8cbc17e03119fcaa735a4bc2f0451000ab54f;p=libsigrok.git

Sigma: Limit number of edge triggers to 1.

Actually, Sigma supports 2 rising/falling triggers,
but they are ORed and the current trigger syntax
does not permit ORed triggers.
---

diff --git a/hardware/asix-sigma/asix-sigma.c b/hardware/asix-sigma/asix-sigma.c
index af8e6d27..7cc7c9da 100644
--- a/hardware/asix-sigma/asix-sigma.c
+++ b/hardware/asix-sigma/asix-sigma.c
@@ -643,8 +643,13 @@ static int configure_probes(struct sigrok_device_instance *sdi, GSList *probes)
 				++trigger_set;
 			}
 
-			if (trigger_set > 2) {
-				g_warning("Asix Sigma only supports 2 rising/"
+                        /*
+                         * Actually, Sigma supports 2 rising/falling triggers,
+                         * but they are ORed and the current trigger syntax
+                         * does not permit ORed triggers.
+                         */
+			if (trigger_set > 1) {
+				g_warning("Asix Sigma only supports 1 rising/"
 					  "falling triggers.");
 				return SIGROK_ERR;
 			}