fx2lafw: Insert SYNCDELAYs where necessary according to TRM

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

diff --git a/fx2lafw.c b/fx2lafw.c
index 4a1dfe41c187fed23cc5c32e221c03a7d64c0cc0..629e28c00d2dd3d13a256591016fe58a057eb456 100644 (file)
--- a/fx2lafw.c
+++ b/fx2lafw.c
@@ -51,9 +51,7 @@
 volatile __bit got_sud;
 BYTE vendor_command;
 
-volatile WORD ledcounter = 1000;
-
-extern __bit gpif_acquiring;
+volatile WORD ledcounter = 0;
 
 static void setup_endpoints(void)
 {
@@ -106,7 +104,9 @@ static void send_fw_version(void)
 
        /* Send the message. */
        EP0BCH = 0;
+       SYNCDELAY();
        EP0BCL = sizeof(struct version_info);
+       SYNCDELAY();
 }
 
 static void send_revid_version(void)
@@ -119,7 +119,9 @@ static void send_revid_version(void)
 
        /* Send the message. */
        EP0BCH = 0;
+       SYNCDELAY();
        EP0BCL = 1;
+       SYNCDELAY();
 }
 
 BOOL handle_vendorcommand(BYTE cmd)
@@ -127,18 +129,17 @@ BOOL handle_vendorcommand(BYTE cmd)
        /* Protocol implementation */
        switch (cmd) {
        case CMD_START:
+               /* Tell hardware we are ready to receive data. */
                vendor_command = cmd;
                EP0BCL = 0;
+               SYNCDELAY();
                return TRUE;
-               break;
        case CMD_GET_FW_VERSION:
                send_fw_version();
                return TRUE;
-               break;
        case CMD_GET_REVID_VERSION:
                send_revid_version();
                return TRUE;
-               break;
        }
 
        return FALSE;
@@ -196,6 +197,38 @@ void sudav_isr(void) __interrupt SUDAV_ISR
        CLEAR_SUDAV();
 }
 
+/* IN BULK NAK - the host started requesting data. */
+void ibn_isr(void) __interrupt IBN_ISR
+{
+       /*
+        * If the IBN interrupt is not disabled, clearing
+        * does not work. See AN78446, 6.2.
+        */
+       BYTE ibnsave = IBNIE;
+       IBNIE = 0;
+       CLEAR_USBINT();
+
+       /*
+        * If the host sent the START command, start the GPIF
+        * engine. The host will repeat the BULK IN in the next
+        * microframe.
+        */
+       if ((IBNIRQ & bmEP2IBN) && (gpif_acquiring == PREPARED)) {
+               ledcounter = 1;
+               PA1 = 0;
+               gpif_acquisition_start();
+       }
+
+       /* Clear IBN flags for all EPs. */
+       IBNIRQ = 0xff;
+
+       NAKIRQ = bmIBN;
+       SYNCDELAY();
+
+       IBNIE = ibnsave;
+       SYNCDELAY();
+}
+
 void usbreset_isr(void) __interrupt USBRESET_ISR
 {
        handle_hispeed(FALSE);
@@ -211,12 +244,12 @@ void hispeed_isr(void) __interrupt HISPEED_ISR
 void timer2_isr(void) __interrupt TF2_ISR
 {
        /* Blink LED during acquisition, keep it on otherwise. */
-       if (gpif_acquiring) {
+       if (gpif_acquiring == RUNNING) {
                if (--ledcounter == 0) {
                        PA1 = !PA1;
                        ledcounter = 1000;
                }
-       } else {
+       } else if (gpif_acquiring == STOPPED) {
                PA1 = 1; /* LED on. */
        }
        TF2 = 0;
@@ -239,6 +272,7 @@ void fx2lafw_init(void)
 
        /* TODO: Does the order of the following lines matter? */
        ENABLE_SUDAV();
+       ENABLE_EP2IBN();
        ENABLE_HISPEED();
        ENABLE_USBRESET();
 
@@ -278,7 +312,7 @@ void fx2lafw_poll(void)
                                break;
 
                        if (EP0BCL == sizeof(struct cmd_start_acquisition)) {
-                               gpif_acquisition_start(
+                               gpif_acquisition_prepare(
                                 (const struct cmd_start_acquisition *)EP0BUF);
                        }