Update fx2lafw code to work with recent sdcc.

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

diff --git a/fx2lafw.c b/fx2lafw.c
index c523b1609eb82f0f27f061f177e24e6ce1d93a89..7fe952843a6c165ef33d6ccd363bf95b77a8c719 100644 (file)
--- a/fx2lafw.c
+++ b/fx2lafw.c
@@ -50,7 +50,7 @@
 #include <gpif-acquisition.h>
 
 /* ... */
-volatile bit got_sud;
+volatile __bit got_sud;
 BYTE vendor_command;
 
 static void setup_endpoints(void)
@@ -95,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;
        }
 
@@ -165,24 +194,24 @@ BOOL handle_set_configuration(BYTE cfg)
        return (cfg == 1) ? TRUE : FALSE;
 }
 
-void sudav_isr(void) interrupt SUDAV_ISR
+void sudav_isr(void) __interrupt SUDAV_ISR
 {
        got_sud = TRUE;
        CLEAR_SUDAV();
 }
 
-void sof_isr(void) interrupt SOF_ISR using 1
+void sof_isr(void) __interrupt SOF_ISR __using 1
 {
        CLEAR_SOF();
 }
 
-void usbreset_isr(void) interrupt USBRESET_ISR
+void usbreset_isr(void) __interrupt USBRESET_ISR
 {
        handle_hispeed(FALSE);
        CLEAR_USBRESET();
 }
 
-void hispeed_isr(void) interrupt HISPEED_ISR
+void hispeed_isr(void) __interrupt HISPEED_ISR
 {
        handle_hispeed(TRUE);
        CLEAR_HISPEED();
@@ -228,26 +257,18 @@ 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;
@@ -257,3 +278,10 @@ void fx2lafw_poll(void)
 
        gpif_poll();
 }
+
+void main(void)
+{
+       fx2lafw_init();
+       while (1)
+               fx2lafw_poll();
+}