scopes: Initialize PORTA/C/E consistently for all devices.

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

diff --git a/sainsmart_dds120.c b/sainsmart_dds120.c
index 2c3b73c67f2757496e3ca5415ce0fecdd9614261..8a05df195aa25bd7f871350689a0d14871b41bcb 100644 (file)
--- a/sainsmart_dds120.c
+++ b/sainsmart_dds120.c
@@ -24,9 +24,21 @@
 #include <delay.h>
 #include <setupdat.h>
 
+#define SET_ANALOG_MODE() PA7 = 1
+
+/* Toggle the 1kHz calibration pin, only accurate up to ca. 8MHz. */
+/* Note: There's no PE2 as IOE is not bit-addressable (see TRM 15.2). */
+#define TOGGLE_CALIBRATION_PIN() IOE = IOE ^ 0x04
+
+#define LED_CLEAR() NOP
+#define LED_GREEN() NOP
+#define LED_RED()   NOP
+
 /* Change to support as many interfaces as you need. */
 static BYTE altiface = 0;
 
+static volatile WORD ledcounter = 0;
+
 static volatile __bit dosud = FALSE;
 static volatile __bit dosuspend = FALSE;
 
@@ -64,13 +76,19 @@ void suspend_isr(void) __interrupt SUSPEND_ISR
 
 void timer2_isr(void) __interrupt TF2_ISR
 {
-       /* Toggle the 1kHz pin, only accurate up to ca 8MHz */
-       IOE = IOE^0x04;
+       TOGGLE_CALIBRATION_PIN();
+
+       if (ledcounter && (--ledcounter == 0))
+               LED_CLEAR();
+
        TF2 = 0;
 }
 
 /**
- * The gain stage is 2 stage approach. -6dB and -20dB on the first stage (attentuator). The second stage is then doing the gain by 3 different resistor values switched into the feedback loop.
+ * The gain stage is 2 stage approach. -6dB and -20dB on the first stage
+ * (attentuator). The second stage is then doing the gain by 3 different
+ * resistor values switched into the feedback loop.
+ *
  * #Channel 0:
  * PC1=1; PC2=0; PC3= 0 -> Gain x0.1 = -20dB
  * PC1=1; PC2=0; PC3= 1 -> Gain x0.2 = -14dB
@@ -78,6 +96,7 @@ void timer2_isr(void) __interrupt TF2_ISR
  * PC1=0; PC2=0; PC3= 0 -> Gain x0.5 =  -6dB
  * PC1=0; PC2=0; PC3= 1 -> Gain x1   =   0dB
  * PC1=0; PC2=1; PC3= 0 -> Gain x2   =  +6dB
+ *
  * #Channel 1:
  * PE1=1; PC4=0; PC5= 0 -> Gain x0.1 = -20dB 
  * PE1=1; PC4=0; PC5= 1 -> Gain x0.2 = -14dB
@@ -149,7 +168,6 @@ static BOOL set_voltage(BYTE channel, BYTE val)
        return TRUE;
 }
 
-
 /**
  * Each LSB in the nibble of the byte controls the coupling per channel.
  *
@@ -205,6 +223,8 @@ static void start_sampling(void)
 {
        int i;
 
+       SET_ANALOG_MODE();
+
        clear_fifo();
 
        for (i = 0; i < 1000; i++);
@@ -218,6 +238,9 @@ static void start_sampling(void)
        GPIFTCB0 = 0;
        GPIFTRIG = (altiface == 0) ? 6 : 4;
 
+       /* Set green LED, don't clear LED afterwards (ledcounter = 0). */
+       LED_GREEN();
+       ledcounter = 0;
 }
 
 static void select_interface(BYTE alt)
@@ -292,16 +315,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 */
@@ -326,8 +351,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 = 0x44; /* OE2=1, CTL2=1 */
+       EXTAUTODAT2 = 0x44; /* OE2=1, CTL2=1 */
        EXTAUTODAT2 = 0;
        EXTAUTODAT2 = 0;
        EXTAUTODAT2 = 0;
@@ -416,6 +441,10 @@ BOOL handle_vendorcommand(BYTE cmd)
 {
        stop_sampling();
 
+       /* Set red LED, clear after timeout. */
+       LED_RED();
+       ledcounter = 1000;
+
        /* Clear EP0BCH/L for each valid command. */
        if (cmd >= 0xe0 && cmd <= 0xe6) {
                EP0BCH = 0;
@@ -454,6 +483,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. */
@@ -497,14 +528,14 @@ static void main(void)
 
        RENUMERATE_UNCOND();
 
+       PORTECFG = 0;
        PORTCCFG = 0;
        PORTACFG = 0;
-       PORTECFG = 0;
-       OEE = 0xFF;
+       OEE = 0xff;
        OEC = 0xff;
-       OEA = 0x80;
+       OEA = 0xff;
 
-       PA7 = 1;
+       SET_ANALOG_MODE();
 
        while (TRUE) {
                if (dosud) {
@@ -516,7 +547,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