Add "fx2lafw-" prefix to the 6022BE/DDS120 firmware files.

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

diff --git a/sainsmart_dds120.c b/sainsmart_dds120.c
index 6748d47bd286cd1973efe7735c2a818ebd1ec00a..9f06af32ae318bf0bd13915951563b7fe7e88f47 100644 (file)
--- a/sainsmart_dds120.c
+++ b/sainsmart_dds120.c
@@ -288,7 +288,7 @@ static BOOL set_samplerate(BYTE rate)
        IFCONFIG = samplerates[i].ifcfg;
 
        AUTOPTRSETUP = 7;
-       AUTOPTRH2 = 0xE4;
+       AUTOPTRH2 = 0xE4; /* 0xE400: GPIF waveform descriptor 0. */
        AUTOPTRL2 = 0x00;
 
        /*
@@ -305,6 +305,7 @@ static BOOL set_samplerate(BYTE rate)
         * jump 0, CTL2=Z, FIFO, LOOP
         */
 
+       /* LENGTH / BRANCH 0-7 */
        EXTAUTODAT2 = samplerates[i].wait0;
        EXTAUTODAT2 = samplerates[i].wait1;
        EXTAUTODAT2 = 1;
@@ -314,24 +315,27 @@ static BOOL set_samplerate(BYTE rate)
        EXTAUTODAT2 = 0;
        EXTAUTODAT2 = 0;
 
+       /* OPCODE 0-7 */
        EXTAUTODAT2 = samplerates[i].opc0;
        EXTAUTODAT2 = samplerates[i].opc1;
-       EXTAUTODAT2 = 1;
+       EXTAUTODAT2 = 1; /* DATA=0 DP=1 */
        EXTAUTODAT2 = 0;
        EXTAUTODAT2 = 0;
        EXTAUTODAT2 = 0;
        EXTAUTODAT2 = 0;
        EXTAUTODAT2 = 0;
 
+       /* OUTPUT 0-7 */
        EXTAUTODAT2 = samplerates[i].out0;
-       EXTAUTODAT2 = 0x44;
-       EXTAUTODAT2 = 0x44;
-       EXTAUTODAT2 = 0x00;
-       EXTAUTODAT2 = 0x00;
-       EXTAUTODAT2 = 0x00;
-       EXTAUTODAT2 = 0x00;
-       EXTAUTODAT2 = 0x00;
+       EXTAUTODAT2 = 0x44; /* OE0=1, CTL0=1 */
+       EXTAUTODAT2 = 0x44; /* OE0=1, CTL0=1 */
+       EXTAUTODAT2 = 0;
+       EXTAUTODAT2 = 0;
+       EXTAUTODAT2 = 0;
+       EXTAUTODAT2 = 0;
+       EXTAUTODAT2 = 0;
 
+       /* LOGIC FUNCTION 0-7 */
        EXTAUTODAT2 = 0;
        EXTAUTODAT2 = 0;
        EXTAUTODAT2 = 0;
@@ -352,18 +356,18 @@ static BOOL set_calibration_pulse(BYTE fs)
        switch (fs) {
        case 0:         // 100Hz
                RCAP2L = -10000 & 0xff;
-               RCAP2H = (-10000 >> 8) & 0xff;
+               RCAP2H = (-10000 & 0xff00) >> 8;
                return TRUE;
        case 1:         // 1kHz
                RCAP2L = -1000 & 0xff;
-               RCAP2H = (-1000 >> 8) & 0xff;
+               RCAP2H = (-1000 & 0xff00) >> 8;
                return TRUE;
        case 10:        // 1kHz
-               RCAP2L = -100 & 0xff;
+               RCAP2L = (BYTE)(-100 & 0xff);
                RCAP2H = 0xff;
                return TRUE;
        case 50:        // 50kHz
-               RCAP2L = -20 & 0xff;
+               RCAP2L = (BYTE)(-20 & 0xff);
                RCAP2H = 0xff;
                return TRUE;
        default:
@@ -452,8 +456,8 @@ static void init(void)
        EP8CFG = 0;
 
        /* In idle mode tristate all outputs. */
-       GPIFIDLECTL = 0x00;
-       GPIFCTLCFG = 0x80;
+       GPIFIDLECTL = 0x00; /* Don't enable CTL0-5 outputs. */
+       GPIFCTLCFG = 0x80; /* TRICTL=1. CTL0-2: CMOS outputs, tri-statable. */
        GPIFWFSELECT = 0x00;
        GPIFREADYSTAT = 0x00;
 
@@ -487,7 +491,7 @@ static void main(void)
 
        /* Init timer2. */
        RCAP2L = -1000 & 0xff;
-       RCAP2H = (-1000 >> 8) & 0xff;
+       RCAP2H = (-1000 & 0xff00) >> 8;
        T2CON = 0;
        ET2 = 1;
        TR2 = 1;