Import fx2lib into fx2lafw directly.

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

diff --git a/fx2lafw.c b/fx2lafw.c
index 034d5ba4b12fe7a17859ce409e18d0802df57dec..018f7604dbdf731f54c26a6fcbdbb09b4dde5bbb 100644 (file)
--- a/fx2lafw.c
+++ b/fx2lafw.c
@@ -59,44 +59,29 @@ static void setup_endpoints(void)
        EP2CFG = (1 << 7) |               /* EP is valid/activated */
                 (1 << 6) |               /* EP direction: IN */
                 (1 << 5) | (0 << 4) |    /* EP Type: bulk */
-                (0 << 3) |               /* EP buffer size: 512 */
+                (1 << 3) |               /* EP buffer size: 1024 */
                 (0 << 2) |               /* Reserved. */
                 (0 << 1) | (0 << 0);     /* EP buffering: quad buffering */
        SYNCDELAY();
 
-       /* Setup EP6 (IN) in the debug build. */
-#ifdef DEBUG
-       EP6CFG = (1 << 7) |               /* EP is valid/activated */
-                (1 << 6) |               /* EP direction: IN */
-                (1 << 5) | (0 << 4) |    /* EP Type: bulk */
-                (0 << 3) |               /* EP buffer size: 512 */
-                (0 << 2) |               /* Reserved */
-                (1 << 1) | (0 << 0);     /* EP buffering: double buffering */
-#else
-       EP6CFG &= ~bmVALID;
-#endif
-       SYNCDELAY();
-
-       /* Disable all other EPs (EP1, EP4, and EP8). */
+       /* Disable all other EPs (EP1, EP4, EP6, and EP8). */
        EP1INCFG &= ~bmVALID;
        SYNCDELAY();
        EP1OUTCFG &= ~bmVALID;
        SYNCDELAY();
        EP4CFG &= ~bmVALID;
        SYNCDELAY();
+       EP6CFG &= ~bmVALID;
+       SYNCDELAY();
        EP8CFG &= ~bmVALID;
        SYNCDELAY();
 
        /* EP2: Reset the FIFOs. */
        /* Note: RESETFIFO() gets the EP number WITHOUT bit 7 set/cleared. */
        RESETFIFO(0x02)
-#ifdef DEBUG
-       /* Reset the FIFOs of EP6 when in debug mode. */
-       RESETFIFO(0x06)
-#endif
 
        /* EP2: Enable AUTOIN mode. Set FIFO width to 8bits. */
-       EP2FIFOCFG = bmAUTOIN | ~bmWORDWIDE;
+       EP2FIFOCFG = bmAUTOIN;
        SYNCDELAY();
 
        /* EP2: Auto-commit 512 (0x200) byte packets (due to AUTOIN = 1). */
@@ -110,18 +95,47 @@ static void setup_endpoints(void)
        SYNCDELAY();
 }
 
+static void send_fw_version(void)
+{
+       /* Populate the buffer. */
+       struct version_info *const vi = (struct version_info *)EP0BUF;
+       vi->major = FX2LAFW_VERSION_MAJOR;
+       vi->minor = FX2LAFW_VERSION_MINOR;
+
+       /* Send the message. */
+       EP0BCH = 0;
+       EP0BCL = sizeof(struct version_info);
+}
+
+static void send_revid_version(void)
+{
+       uint8_t *p;
+
+       /* Populate the buffer. */
+       p = (uint8_t *)EP0BUF;
+       *p = REVID;
+
+       /* Send the message. */
+       EP0BCH = 0;
+       EP0BCL = 1;
+}
+
 BOOL handle_vendorcommand(BYTE cmd)
 {
        /* Protocol implementation */
        switch (cmd) {
        case CMD_START:
-               /* There is data to receive - arm EP0 */
+               vendor_command = cmd;
                EP0BCL = 0;
+               return TRUE;
+               break;
        case CMD_GET_FW_VERSION:
-               vendor_command = cmd;
+               send_fw_version();
+               return TRUE;
+               break;
+       case CMD_GET_REVID_VERSION:
+               send_revid_version();
                return TRUE;
-       default:
-               /* Unimplemented command. */
                break;
        }
 
@@ -243,30 +257,31 @@ void fx2lafw_poll(void)
 
        if (vendor_command) {
                switch (vendor_command) {
-               case CMD_GET_FW_VERSION:
-                       /* TODO */
-
-                       /* Acknowledge the vendor command. */
-                       vendor_command = 0;
-                       break;
-
                case CMD_START:
-                       if((EP0CS & bmEPBUSY) != 0)
+                       if ((EP0CS & bmEPBUSY) != 0)
                                break;
 
-                       if(EP0BCL == 2) {
+                       if (EP0BCL == sizeof(struct cmd_start_acquisition)) {
                                gpif_acquisition_start(
-                                       (const struct cmd_start_acquisition*)EP0BUF);
+                                (const struct cmd_start_acquisition *)EP0BUF);
                        }
 
                        /* Acknowledge the vendor command. */
                        vendor_command = 0;
                        break;
-
                default:
                        /* Unimplemented command. */
                        vendor_command = 0;
                        break;
                }
        }
+
+       gpif_poll();
+}
+
+void main(void)
+{
+       fx2lafw_init();
+       while (1)
+               fx2lafw_poll();
 }