scopes: Use RENUMERATE_UNCOND() for all devices.

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

diff --git a/hantek_6022bl.c b/hantek_6022bl.c
index 2c5c4c03aec0bb6c352af5225a565725d74499a7..d637c8227360de210f49ac0e6b4c39157613bb53 100644 (file)
--- a/hantek_6022bl.c
+++ b/hantek_6022bl.c
@@ -24,6 +24,15 @@
 #include <delay.h>
 #include <setupdat.h>
 
+#define SET_ANALOG_MODE() PA7 = 1
+
+/* Toggle the 1kHz calibration pin, only accurate up to ca. 8MHz. */
+#define TOGGLE_CALIBRATION_PIN() PC2 = !PC2
+
+#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,16 +75,11 @@ void suspend_isr(void) __interrupt SUSPEND_ISR
 
 void timer2_isr(void) __interrupt TF2_ISR
 {
-       /* Toggle the 1kHz calibration pin, only accurate up to ca 8MHz. */
-       PC2 = !PC2;
-
-       if (ledcounter) {
-               if (--ledcounter == 0) {
-                       /* Clear LED. */
-                       PC0 = 1;
-                       PC1 = 1;
-               }
-       }
+       TOGGLE_CALIBRATION_PIN();
+
+       if (ledcounter && (--ledcounter == 0))
+               LED_CLEAR();
+
        TF2 = 0;
 }
 
@@ -164,8 +168,7 @@ static void start_sampling(void)
 {
        int i;
 
-       /* Set analog mode. */
-       PA7 = 1;
+       SET_ANALOG_MODE();
 
        clear_fifo();
 
@@ -180,10 +183,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)
@@ -223,16 +225,16 @@ static const struct samplerate_info {
 } samplerates[] = {
        { 48, 0x80,   0, 3, 0, 0x00, 0xea },
        { 30, 0x80,   0, 3, 0, 0x00, 0xaa },
-       { 24,    1,   0, 2, 1, 0x40, 0xca },
-       { 16,    1,   1, 2, 0, 0x40, 0xca },
-       { 12,    2,   1, 2, 0, 0x40, 0xca },
-       {  8,    3,   2, 2, 0, 0x40, 0xca },
-       {  4,    6,   5, 2, 0, 0x40, 0xca },
-       {  2,   12,  11, 2, 0, 0x40, 0xca },
-       {  1,   24,  23, 2, 0, 0x40, 0xca },
-       { 50,   48,  47, 2, 0, 0x40, 0xca },
-       { 20,  120, 119, 2, 0, 0x40, 0xca },
-       { 10,  240, 239, 2, 0, 0x40, 0xca },
+       { 24,    1,   0, 2, 1, 0x10, 0xca },
+       { 16,    1,   1, 2, 0, 0x10, 0xca },
+       { 12,    2,   1, 2, 0, 0x10, 0xca },
+       {  8,    3,   2, 2, 0, 0x10, 0xca },
+       {  4,    6,   5, 2, 0, 0x10, 0xca },
+       {  2,   12,  11, 2, 0, 0x10, 0xca },
+       {  1,   24,  23, 2, 0, 0x10, 0xca },
+       { 50,   48,  47, 2, 0, 0x10, 0xca },
+       { 20,  120, 119, 2, 0, 0x10, 0xca },
+       { 10,  240, 239, 2, 0, 0x10, 0xca },
 };
 
 static BOOL set_samplerate(BYTE rate)
@@ -253,16 +255,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 */
@@ -287,8 +291,8 @@ static BOOL set_samplerate(BYTE rate)
 
        /* OUTPUT 0-7 */
        EXTAUTODAT2 = samplerates[i].out0;
-       EXTAUTODAT2 = 0x44; /* OE0=1, CTL0=1 */
-       EXTAUTODAT2 = 0x44; /* OE0=1, CTL0=1 */
+       EXTAUTODAT2 = 0x11; /* OE0=1, CTL0=1 */
+       EXTAUTODAT2 = 0x11; /* OE0=1, CTL0=1 */
        EXTAUTODAT2 = 0;
        EXTAUTODAT2 = 0;
        EXTAUTODAT2 = 0;
@@ -353,9 +357,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. */
@@ -390,8 +393,7 @@ static void init(void)
        EP4CFG = 0;
        EP8CFG = 0;
 
-       /* Set analog mode. */
-       PA7 = 1;
+       SET_ANALOG_MODE();
 
        /* In idle mode tristate all outputs. */
        GPIFIDLECTL = 0x00; /* Don't enable CTL0-5 outputs. */
@@ -434,12 +436,14 @@ static void main(void)
        ET2 = 1;
        TR2 = 1;
 
-       RENUMERATE();
+       RENUMERATE_UNCOND();
 
+       PORTECFG = 0;
        PORTCCFG = 0;
        PORTACFG = 0;
+       OEE = 0xff;
        OEC = 0xff;
-       OEA = 0x80;
+       OEA = 0xff;
 
        while (TRUE) {
                if (dosud) {
@@ -451,7 +455,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