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 99e43c97218382f104172250f795be03ae059cd4..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,10 @@ 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;
 }
@@ -165,8 +168,7 @@ static void start_sampling(void)
 {
        int i;
 
-       /* Set analog mode. */
-       PA7 = 1;
+       SET_ANALOG_MODE();
 
        clear_fifo();
 
@@ -181,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)
@@ -356,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. */
@@ -393,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. */
@@ -437,10 +436,12 @@ static void main(void)
        ET2 = 1;
        TR2 = 1;
 
-       RENUMERATE();
+       RENUMERATE_UNCOND();
 
+       PORTECFG = 0;
        PORTCCFG = 0;
        PORTACFG = 0;
+       OEE = 0xff;
        OEC = 0xff;
        OEA = 0xff;