From: Joel Holdsworth <redacted>
Date: Tue, 10 Apr 2012 17:30:46 +0000 (+0100)
Subject: Implemented CMD_GET_FW_VERSION
X-Git-Tag: sigrok-firmware-fx2lafw-0.1.0~33
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=18544912fb14f1beb10fe375aad9743a8e8df790;p=sigrok-firmware-fx2lafw.git

Implemented CMD_GET_FW_VERSION
---

diff --git a/fx2lafw.c b/fx2lafw.c
index f69fcd5a..dc54d005 100644
--- a/fx2lafw.c
+++ b/fx2lafw.c
@@ -95,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;
@@ -228,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;
diff --git a/include/command.h b/include/command.h
index d238195d..cc5f91c2 100644
--- a/include/command.h
+++ b/include/command.h
@@ -29,6 +29,12 @@
 #define CMD_START_FLAGS_CLK_30MHZ	(0 << CMD_START_FLAGS_CLK_SRC_POS)
 #define CMD_START_FLAGS_CLK_48MHZ	(1 << CMD_START_FLAGS_CLK_SRC_POS)
 
+struct version_info
+{
+	uint8_t major;
+	uint8_t minor;
+};
+
 struct cmd_start_acquisition
 {
 	uint8_t flags;
diff --git a/include/fx2lafw.h b/include/fx2lafw.h
index fcafa62e..b990e4e6 100644
--- a/include/fx2lafw.h
+++ b/include/fx2lafw.h
@@ -21,3 +21,6 @@
 #include <autovector.h>
 
 #define SYNCDELAY() SYNCDELAY4
+
+#define FX2LAFW_VERSION_MAJOR	1
+#define FX2LAFW_VERSION_MINOR	0