X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=fx2lafw.c;h=dc54d0052a53245b0b6bf580598806b1b67e81fa;hb=18544912fb14f1beb10fe375aad9743a8e8df790;hp=d4423633a56735166c62cec46cd63909204c1944;hpb=293d7e9e38e0a69ab8e51ab9601bfb0bd6c5c9b8;p=sigrok-firmware-fx2lafw.git

diff --git a/fx2lafw.c b/fx2lafw.c
index d4423633..dc54d005 100644
--- a/fx2lafw.c
+++ b/fx2lafw.c
@@ -59,31 +59,20 @@ 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();
 
@@ -91,11 +80,6 @@ static void setup_endpoints(void)
 	/* 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;
 	SYNCDELAY();
@@ -111,19 +95,30 @@ 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);
+}
+
 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;
+
 	case CMD_GET_FW_VERSION:
-		vendor_command = cmd;
+		send_fw_version();
 		return TRUE;
-	default:
-		/* Unimplemented command. */
-		break;
 	}
 
 	return FALSE;
@@ -244,13 +239,6 @@ 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)
 				break;
@@ -273,3 +261,10 @@ void fx2lafw_poll(void)
 
 	gpif_poll();
 }
+
+void main(void)
+{
+	fx2lafw_init();
+	while (1)
+		fx2lafw_poll();
+}