scopes: Adapt/fix some code comments, cosmetics.

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

diff --git a/hantek_6022bl.c b/hantek_6022bl.c
index 2c5c4c03aec0bb6c352af5225a565725d74499a7..99e43c97218382f104172250f795be03ae059cd4 100644 (file)
--- a/hantek_6022bl.c
+++ b/hantek_6022bl.c
@@ -66,7 +66,7 @@ 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. */
+       /* Toggle the 1kHz calibration pin, only accurate up to ca. 8MHz. */
        PC2 = !PC2;
 
        if (ledcounter) {
@@ -76,6 +76,7 @@ void timer2_isr(void) __interrupt TF2_ISR
                        PC1 = 1;
                }
        }
+
        TF2 = 0;
 }
 
@@ -223,16 +224,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 +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 */
@@ -287,8 +290,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;
@@ -439,7 +442,7 @@ static void main(void)
        PORTCCFG = 0;
        PORTACFG = 0;
        OEC = 0xff;
-       OEA = 0x80;
+       OEA = 0xff;
 
        while (TRUE) {
                if (dosud) {
@@ -451,7 +454,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