fx2lafw: Delay start of GPIF until first BULK IN request is received

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

diff --git a/fx2lafw.c b/fx2lafw.c
index 73fbf2032239f0a84a1c900d0cbfe24b2f55f525..b99d77f4b559ef671510fec309e9f4b3721f6d2d 100644 (file)
--- a/fx2lafw.c
+++ b/fx2lafw.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the fx2lafw project.
+ * This file is part of the sigrok-firmware-fx2lafw project.
  *
  * Copyright (C) 2011-2012 Uwe Hermann <uwe@hermann-uwe.de>
  *
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -39,6 +38,7 @@
 
 #include <fx2regs.h>
 #include <fx2macros.h>
+#include <fx2ints.h>
 #include <delay.h>
 #include <setupdat.h>
 #include <eputils.h>
@@ -51,6 +51,8 @@
 volatile __bit got_sud;
 BYTE vendor_command;
 
+volatile WORD ledcounter = 0;
+
 static void setup_endpoints(void)
 {
        /* Setup EP2 (IN). */
@@ -123,18 +125,16 @@ 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;
                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;
@@ -192,9 +192,36 @@ void sudav_isr(void) __interrupt SUDAV_ISR
        CLEAR_SUDAV();
 }
 
-void sof_isr(void) __interrupt SOF_ISR __using 1
+/* IN BULK NAK - the host started requesting data. */
+void ibn_isr(void) __interrupt IBN_ISR
 {
-       CLEAR_SOF();
+       /*
+        * 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
@@ -209,6 +236,20 @@ void hispeed_isr(void) __interrupt HISPEED_ISR
        CLEAR_HISPEED();
 }
 
+void timer2_isr(void) __interrupt TF2_ISR
+{
+       /* Blink LED during acquisition, keep it on otherwise. */
+       if (gpif_acquiring == RUNNING) {
+               if (--ledcounter == 0) {
+                       PA1 = !PA1;
+                       ledcounter = 1000;
+               }
+       } else if (gpif_acquiring == STOPPED) {
+               PA1 = 1; /* LED on. */
+       }
+       TF2 = 0;
+}
+
 void fx2lafw_init(void)
 {
        /* Set DYN_OUT and ENH_PKT bits, as recommended by the TRM. */
@@ -226,10 +267,22 @@ void fx2lafw_init(void)
 
        /* TODO: Does the order of the following lines matter? */
        ENABLE_SUDAV();
-       ENABLE_SOF();
+       ENABLE_EP2IBN();
        ENABLE_HISPEED();
        ENABLE_USBRESET();
 
+       /* PA1 (LED) is an output. */
+       PORTACFG = 0;
+       OEA = (1 << 1);
+       PA1 = 1; /* LED on. */
+
+       /* Init timer2. */
+       RCAP2L = -500 & 0xff;
+       RCAP2H = (-500 & 0xff00) >> 8;
+       T2CON = 0;
+       ET2 = 1;
+       TR2 = 1;
+
        /* Global (8051) interrupt enable. */
        EA = 1;
 
@@ -254,7 +307,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);
                        }