X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=fx2lafw.c;h=7fe952843a6c165ef33d6ccd363bf95b77a8c719;hb=cb87c238f743afa9e563740e1bec436ea839796e;hp=18d31f6265365429016fed7ed9b9f4cf74ed745f;hpb=3b6919fa4ed05ab312162e27ef8a2bc5ec5b7976;p=sigrok-firmware-fx2lafw.git

diff --git a/fx2lafw.c b/fx2lafw.c
index 18d31f62..7fe95284 100644
--- a/fx2lafw.c
+++ b/fx2lafw.c
@@ -50,7 +50,8 @@
 #include <gpif-acquisition.h>
 
 /* ... */
-volatile bit got_sud;
+volatile __bit got_sud;
+BYTE vendor_command;
 
 static void setup_endpoints(void)
 {
@@ -58,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). */
@@ -109,19 +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:
+		vendor_command = cmd;
+		EP0BCL = 0;
+		return TRUE;
+		break;
 	case CMD_GET_FW_VERSION:
-		/* TODO */
+		send_fw_version();
+		return TRUE;
 		break;
-	case CMD_START:
-		gpif_acquisition_start();
+	case CMD_GET_REVID_VERSION:
+		send_revid_version();
 		return TRUE;
-	default:
-		/* Unimplemented command. */
 		break;
 	}
 
@@ -180,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();
@@ -209,6 +223,7 @@ void fx2lafw_init(void)
 	REVCTL = bmNOAUTOARM | bmSKIPCOMMIT;
 
 	got_sud = FALSE;
+	vendor_command = 0;
 
 	/* Renumerate. */
 	RENUMERATE_UNCOND();
@@ -233,10 +248,40 @@ void fx2lafw_init(void)
 	gpif_init_la();
 }
 
-void fx2lafw_run(void)
+void fx2lafw_poll(void)
 {
 	if (got_sud) {
 		handle_setupdata();
 		got_sud = FALSE;
 	}
+
+	if (vendor_command) {
+		switch (vendor_command) {
+		case CMD_START:
+			if ((EP0CS & bmEPBUSY) != 0)
+				break;
+
+			if (EP0BCL == sizeof(struct cmd_start_acquisition)) {
+				gpif_acquisition_start(
+				 (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();
 }