sw/fw: fix bug that caused ADC external triggers to be ignored

0ad009fa · Dimitris Lampridis · df6f2d76 · 0ad009fa
Commit 0ad009fa authored Mar 11, 2019 by Dimitris Lampridis
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

wrtd-adcin.c software/firmware/adc/wrtd-adcin.c +9 -2

No files found.
--- a/software/firmware/adc/wrtd-adcin.c
+++ b/software/firmware/adc/wrtd-adcin.c
@@ -77,8 +77,15 @@ static void adcin_input(struct wrtd_adcin_dev *adcin)
        ev.ts.frac = 0;

        for (i = 0; i < ADCIN_NUM_CHANNELS; i++) {
-                if (!(mask & ((ALT_TRIGOUT_CH1_MASK >> 32) << i)))
-                        continue;
+
+		/* The last channel is the ext trigger with a different mask */
+		if ( i == ADCIN_NUM_CHANNELS - 1 ) {
+			if (!(mask & (ALT_TRIGOUT_EXT_MASK >> 32)))
+				continue;
+		}
+		else if (!(mask & ((ALT_TRIGOUT_CH1_MASK >> 32) << i)))
+			continue;
+
                memset(ev.id, 0, WRTD_ID_LEN);
                ev.id[0] = 'A';
                ev.id[1] = 'D';