fx2lafw: Support 24 and 32 channel mode

Author: zeldin

src/hardware/fx2lafw/api.c

@@ -117,7 +117,7 @@ static const struct fx2lafw_profile supported_fx2[] = {
 	 */
 	{ 0x04b4, 0x00f3, "Cypress", "SuperSpeed Explorer Kit", NULL,
 		"fx3lafw-cypress-fx3.fw",
-		DEV_CAPS_FX3 | DEV_CAPS_16BIT, NULL, NULL },
+		DEV_CAPS_FX3 | DEV_CAPS_32BIT, NULL, NULL },
 
 	ALL_ZERO
 };
@@ -309,7 +309,10 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 		sdi->connection_id = g_strdup(connection_id);
 
 		/* Fill in channellist according to this device's profile. */
-		num_logic_channels = prof->dev_caps & DEV_CAPS_16BIT ? 16 : 8;
+		num_logic_channels =
+			prof->dev_caps & DEV_CAPS_32BIT ? 32 :
+			(prof->dev_caps & DEV_CAPS_24BIT ? 24 :
+			 (prof->dev_caps & DEV_CAPS_16BIT ? 16 : 8));
 		num_analog_channels = prof->dev_caps & DEV_CAPS_AX_ANALOG ? 1 : 0;
 
 		/* Logic channels, all in one channel group. */

src/hardware/fx2lafw/protocol.c

@@ -90,7 +90,7 @@ static int command_start_acquisition(const struct sr_dev_inst *sdi)
 
 	/* Compute the sample rate. */
 	if (!(devc->profile->dev_caps & DEV_CAPS_FX3) &&
-	    devc->sample_wide && samplerate > MAX_16BIT_SAMPLE_RATE) {
+	    devc->unitsize > 1 && samplerate > MAX_16BIT_SAMPLE_RATE) {
 		sr_err("Unable to sample at %" PRIu64 "Hz "
 		       "when collecting 16-bit samples.", samplerate);
 		return SR_ERR;
@@ -131,8 +131,10 @@ static int command_start_acquisition(const struct sr_dev_inst *sdi)
 	cmd.sample_delay_l = delay & 0xff;
 
 	/* Select the sampling width. */
-	cmd.flags |= devc->sample_wide ? CMD_START_FLAGS_SAMPLE_16BIT :
-		CMD_START_FLAGS_SAMPLE_8BIT;
+	cmd.flags |= devc->unitsize == 4 ? CMD_START_FLAGS_SAMPLE_32BIT :
+		(devc->unitsize == 3 ? CMD_START_FLAGS_SAMPLE_24BIT :
+		 (devc->unitsize == 2 ? CMD_START_FLAGS_SAMPLE_16BIT :
+		  CMD_START_FLAGS_SAMPLE_8BIT));
 	/* Enable CTL2 clock. */
 	cmd.flags |= (g_slist_length(devc->enabled_analog_channels) > 0) ? CMD_START_FLAGS_CLK_CTL2 : 0;
 
@@ -270,7 +272,7 @@ SR_PRIV struct dev_context *fx2lafw_dev_new(void)
 	devc->limit_frames = 1;
 	devc->limit_samples = 0;
 	devc->capture_ratio = 0;
-	devc->sample_wide = FALSE;
+	devc->unitsize = 1;
 	devc->num_frames = 0;
 	devc->stl = NULL;
 
@@ -445,7 +447,7 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
 		libusb_error_name(transfer->status), transfer->actual_length);
 
 	/* Save incoming transfer before reusing the transfer struct. */
-	unitsize = devc->sample_wide ? 2 : 1;
+	unitsize = devc->unitsize;
 	cur_sample_count = transfer->actual_length / unitsize;
 	processed_samples = 0;
 
@@ -486,6 +488,8 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
 			num_samples = cur_sample_count - processed_samples;
 			if (devc->limit_samples && devc->sent_samples + num_samples > devc->limit_samples)
 				num_samples = devc->limit_samples - devc->sent_samples;
+			else
+				num_samples = cur_sample_count;
 
 			devc->send_data_proc(sdi, (uint8_t *)transfer->buffer + processed_samples * unitsize,
 				num_samples * unitsize, unitsize);
@@ -574,7 +578,9 @@ static int configure_channels(const struct sr_dev_inst *sdi)
 	 * Use wide sampling if either any of the LA channels 8..15 is enabled,
 	 * and/or at least one analog channel is enabled.
 	 */
-	devc->sample_wide = channel_mask > 0xff || num_analog > 0;
+	devc->unitsize = channel_mask > 0xffffff? 4 :
+			 (channel_mask > 0xffff? 3 :
+			  (channel_mask > 0xff || num_analog > 0? 2 : 1));
 
 	return SR_OK;
 }
@@ -593,6 +599,12 @@ static size_t get_buffer_size(struct dev_context *devc)
 	 * a multiple of 1024.
 	 */
 	s = 10 * to_bytes_per_ms(devc->cur_samplerate);
+	if (devc->unitsize == 3) {
+	  /* Make it a multiple of 3K, to make sure we have an
+	     integral number of samples */
+	  s += 3*1024;
+	  s -= s % (3*1024);
+	}
 	return (s + 1023) & ~1023;
 }
 

src/hardware/fx2lafw/protocol.h

@@ -52,24 +52,30 @@
 #define DEV_CAPS_16BIT_POS	0
 #define DEV_CAPS_AX_ANALOG_POS	1
 #define DEV_CAPS_FX3_POS	2
+#define DEV_CAPS_24BIT_POS	3
+#define DEV_CAPS_32BIT_POS	4
 
 #define DEV_CAPS_16BIT		(1 << DEV_CAPS_16BIT_POS)
 #define DEV_CAPS_AX_ANALOG	(1 << DEV_CAPS_AX_ANALOG_POS)
 #define DEV_CAPS_FX3		(1 << DEV_CAPS_FX3_POS)
+#define DEV_CAPS_24BIT		(1 << DEV_CAPS_24BIT_POS)
+#define DEV_CAPS_32BIT		(1 << DEV_CAPS_32BIT_POS)
 
 /* Protocol commands */
 #define CMD_GET_FW_VERSION		0xb0
 #define CMD_START			0xb1
 #define CMD_GET_REVID_VERSION		0xb2
 
+#define CMD_START_FLAGS_SUPERWIDE_POS	3
 #define CMD_START_FLAGS_CLK_CTL2_POS	4
 #define CMD_START_FLAGS_WIDE_POS	5
 #define CMD_START_FLAGS_CLK_SRC_POS	6
 
 #define CMD_START_FLAGS_CLK_CTL2	(1 << CMD_START_FLAGS_CLK_CTL2_POS)
 #define CMD_START_FLAGS_SAMPLE_8BIT	(0 << CMD_START_FLAGS_WIDE_POS)
 #define CMD_START_FLAGS_SAMPLE_16BIT	(1 << CMD_START_FLAGS_WIDE_POS)
-
+#define CMD_START_FLAGS_SAMPLE_24BIT    ((0 << CMD_START_FLAGS_WIDE_POS) | (1 << CMD_START_FLAGS_SUPERWIDE_POS))
+#define CMD_START_FLAGS_SAMPLE_32BIT    ((1 << CMD_START_FLAGS_WIDE_POS) | (1 << CMD_START_FLAGS_SUPERWIDE_POS))
 #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)
 #define CMD_START_FLAGS_CLK_192MHZ	(2 << CMD_START_FLAGS_CLK_SRC_POS)
@@ -111,7 +117,7 @@ struct dev_context {
 
 	gboolean trigger_fired;
 	gboolean acq_aborted;
-	gboolean sample_wide;
+	uint8_t unitsize;
 	struct soft_trigger_logic *stl;
 
 	uint64_t num_frames;