scopes: Factor out LED_CLEAR(), LED_GREEN(), LED_RED().

[sigrok-firmware-fx2lafw.git] / hantek_6022be.c

diff --git a/hantek_6022be.c b/hantek_6022be.c
index 91a959e24439cd7705e21e2f4ad62bf3e8a70d2d..04ca6eb2eca87add686a7372ae356fbdc999a492 100644 (file)
--- a/hantek_6022be.c
+++ b/hantek_6022be.c
@@ -24,6 +24,15 @@
 #include <delay.h>
 #include <setupdat.h>
 
+#define SET_ANALOG_MODE()
+
+/* Toggle the 1kHz calibration pin, only accurate up to ca. 8MHz. */
+#define TOGGLE_CALIBRATION_PIN() PA7 = !PA7
+
+#define LED_CLEAR() PC0 = 1; PC1 = 1;
+#define LED_GREEN() PC0 = 1; PC1 = 0;
+#define LED_RED()   PC0 = 0; PC1 = 1;
+
 /* Change to support as many interfaces as you need. */
 static BYTE altiface = 0;
 
@@ -66,14 +75,11 @@ void suspend_isr(void) __interrupt SUSPEND_ISR
 
 void timer2_isr(void) __interrupt TF2_ISR
 {
-       PA7 = !PA7;
-       if (ledcounter) {
-               if (--ledcounter == 0) {
-                       /* Clear LED. */
-                       PC0 = 1;
-                       PC1 = 1;
-               }
-       }
+       TOGGLE_CALIBRATION_PIN();
+
+       if (ledcounter && (--ledcounter == 0))
+               LED_CLEAR();
+
        TF2 = 0;
 }
 
@@ -161,6 +167,8 @@ static void start_sampling(void)
 {
        int i;
 
+       SET_ANALOG_MODE();
+
        clear_fifo();
 
        for (i = 0; i < 1000; i++);
@@ -174,10 +182,9 @@ static void start_sampling(void)
        GPIFTCB0 = 0;
        GPIFTRIG = (altiface == 0) ? 6 : 4;
 
-       /* Set green LED, don't clear LED. */
+       /* Set green LED, don't clear LED afterwards (ledcounter = 0). */
+       LED_GREEN();
        ledcounter = 0;
-       PC0 = 1;
-       PC1 = 0;
 }
 
 static void select_interface(BYTE alt)
@@ -247,16 +254,18 @@ static BOOL set_samplerate(BYTE rate)
 
        /*
         * The program for low-speed, e.g. 1 MHz, is:
-        * wait 24, CTL2=0, FIFO
-        * wait 23, CTL2=1
-        * jump 0, CTL2=1
+        * wait 24, CTLx=0, FIFO
+        * wait 23, CTLx=1
+        * jump 0, CTLx=1
         *
         * The program for 24 MHz is:
-        * wait 1, CTL2=0, FIFO
-        * jump 0, CTL2=1
+        * wait 1, CTLx=0, FIFO
+        * jump 0, CTLx=1
         *
         * The program for 30/48 MHz is:
-        * jump 0, CTL2=Z, FIFO, LOOP
+        * jump 0, CTLx=Z, FIFO, LOOP
+        *
+        * (CTLx is device-dependent, could be e.g. CTL0 or CTL2.)
         */
 
        /* LENGTH / BRANCH 0-7 */
@@ -347,9 +356,8 @@ BOOL handle_vendorcommand(BYTE cmd)
 {
        stop_sampling();
 
-       /* Set red LED. */
-       PC0 = 0;
-       PC1 = 1;
+       /* Set red LED, clear after timeout. */
+       LED_RED();
        ledcounter = 1000;
 
        /* Clear EP0BCH/L for each valid command. */
@@ -384,6 +392,8 @@ static void init(void)
        EP4CFG = 0;
        EP8CFG = 0;
 
+       SET_ANALOG_MODE();
+
        /* In idle mode tristate all outputs. */
        GPIFIDLECTL = 0x00; /* Don't enable CTL0-5 outputs. */
        GPIFCTLCFG = 0x80; /* TRICTL=1. CTL0-2: CMOS outputs, tri-statable. */
@@ -442,7 +452,7 @@ static void main(void)
                        dosuspend = FALSE;
                        do {
                                /* Make sure ext wakeups are cleared. */
-                               WAKEUPCS |= bmWU|bmWU2;
+                               WAKEUPCS |= bmWU | bmWU2;
                                SUSPEND = 1;
                                PCON |= 1;
                                __asm