From 98b8cbc17e03119fcaa735a4bc2f0451000ab54f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5vard=20Espeland?= Date: Sat, 15 Jan 2011 20:01:00 +0100 Subject: [PATCH] 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. --- hardware/asix-sigma/asix-sigma.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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; }