X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=fx2lafw.c;h=ef28431f13c6dff1dab1008fa82a1f32ff5c261e;hb=a371bdee728dac611e020aee9219a0b5af15b5af;hp=f69fcd5af6b068898c99861c05d593b0b502bfd1;hpb=f7f91781e4d4d5543371d76bb295316a6655e535;p=sigrok-firmware-fx2lafw.git

diff --git a/fx2lafw.c b/fx2lafw.c
index f69fcd5a..ef28431f 100644
--- a/fx2lafw.c
+++ b/fx2lafw.c
@@ -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;
 	}
 
@@ -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 == 2) {
 				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;