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 26d099711203cfd76e348484486c1509bc710778..8a05df195aa25bd7f871350689a0d14871b41bcb 100644 (file)
--- a/sainsmart_dds120.c
+++ b/sainsmart_dds120.c
@@ -26,9 +26,19 @@
 
 #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;
 
@@ -66,8 +76,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. */
-       IOE = IOE^0x04;
+       TOGGLE_CALIBRATION_PIN();
+
+       if (ledcounter && (--ledcounter == 0))
+               LED_CLEAR();
+
        TF2 = 0;
 }
 
@@ -225,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)
@@ -425,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;
@@ -508,12 +528,12 @@ static void main(void)
 
        RENUMERATE_UNCOND();
 
+       PORTECFG = 0;
        PORTCCFG = 0;
        PORTACFG = 0;
-       PORTECFG = 0;
-       OEE = 0xFF;
+       OEE = 0xff;
        OEC = 0xff;
-       OEA = 0x80;
+       OEA = 0xff;
 
        SET_ANALOG_MODE();