X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Ffx2lafw%2Fdslogic.c;h=a7a50f7fccd43c73e17483e3741de726d837a479;hb=9803346fe2eff369bea6b2373c1c0d37f793eecf;hp=f912278fa23c7505462b50bb700dfd41b25eb70c;hpb=3db03efa4ad43f6d127c3d949a300596cac74ce9;p=libsigrok.git

diff --git a/src/hardware/fx2lafw/dslogic.c b/src/hardware/fx2lafw/dslogic.c
index f912278f..a7a50f7f 100644
--- a/src/hardware/fx2lafw/dslogic.c
+++ b/src/hardware/fx2lafw/dslogic.c
@@ -36,6 +36,29 @@
 
 #define USB_TIMEOUT (3 * 1000)
 
+SR_PRIV int dslogic_set_vth(const struct sr_dev_inst *sdi, double vth)
+{
+	struct sr_usb_dev_inst *usb;
+	int ret;
+	uint8_t cmd;
+
+	usb = sdi->conn;
+
+	cmd = (vth / 5.0) * 255;
+
+	/* Send the control command. */
+	ret = libusb_control_transfer(usb->devhdl, LIBUSB_REQUEST_TYPE_VENDOR |
+			LIBUSB_ENDPOINT_OUT, DS_CMD_VTH, 0x0000, 0x0000,
+			(unsigned char *)&cmd, sizeof(cmd), 3000);
+	if (ret < 0) {
+		sr_err("Unable to send VTH command: %s.",
+		libusb_error_name(ret));
+		return SR_ERR;
+	}
+
+	return SR_OK;
+}
+
 SR_PRIV int dslogic_fpga_firmware_upload(const struct sr_dev_inst *sdi,
 		const char *name)
 {
@@ -171,7 +194,6 @@ static int dslogic_set_trigger(const struct sr_dev_inst *sdi,
 	uint16_t v16;
 
 	devc = sdi->priv;
-	devc->trigger_en = FALSE;
 
 	cfg->trig_mask0[0] = 0xffff;
 	cfg->trig_mask1[0] = 0xffff;
@@ -188,8 +210,33 @@ static int dslogic_set_trigger(const struct sr_dev_inst *sdi,
 	cfg->trig_count0[0] = 0;
 	cfg->trig_count1[0] = 0;
 
-	if (!(trigger = sr_session_trigger_get(sdi->session)))
+	cfg->trig_pos = 0;
+	cfg->trig_sda = 0;
+	cfg->trig_glb = 0;
+	cfg->trig_adp = cfg->count - cfg->trig_pos - 1;
+
+	for (i = 1; i < 16; i++) {
+		cfg->trig_mask0[i] = 0xff;
+		cfg->trig_mask1[i] = 0xff;
+		cfg->trig_value0[i] = 0;
+		cfg->trig_value1[i] = 0;
+		cfg->trig_edge0[i] = 0;
+		cfg->trig_edge1[i] = 0;
+		cfg->trig_count0[i] = 0;
+		cfg->trig_count1[i] = 0;
+		cfg->trig_logic0[i] = 2;
+		cfg->trig_logic1[i] = 2;
+	}
+
+	cfg->trig_pos = (uint32_t)(devc->capture_ratio / 100.0 * devc->limit_samples);
+	sr_dbg("pos: %d", cfg->trig_pos);
+
+	sr_dbg("configuring trigger");
+
+	if (!(trigger = sr_session_trigger_get(sdi->session))) {
+		sr_dbg("No session trigger found");
 		return SR_OK;
+	}
 
 	for (l = trigger->stages; l; l = l->next) {
 		stage = l->data;
@@ -199,7 +246,6 @@ static int dslogic_set_trigger(const struct sr_dev_inst *sdi,
 				/* Ignore disabled channels with a trigger. */
 				continue;
 			channelbit = 1 << (match->channel->index);
-			devc->trigger_en = TRUE; /* Triggered. */
 			/* Simple trigger support (event). */
 			if (match->match == SR_TRIGGER_ONE) {
 				cfg->trig_mask0[0] &= ~channelbit;
@@ -221,30 +267,16 @@ static int dslogic_set_trigger(const struct sr_dev_inst *sdi,
 				cfg->trig_value1[0] |= channelbit;
 				cfg->trig_edge0[0] |= channelbit;
 				cfg->trig_edge1[0] |= channelbit;
-			} else if (match->match == SR_TRIGGER_EDGE){
+			} else if (match->match == SR_TRIGGER_EDGE) {
 				cfg->trig_edge0[0] |= channelbit;
 				cfg->trig_edge1[0] |= channelbit;
 			}
 		}
 	}
 
-	if (devc->trigger_en) {
-		for (i = 1; i < 16; i++) {
-			cfg->trig_mask0[i] = 0xff;
-			cfg->trig_mask1[i] = 0xff;
-			cfg->trig_value0[i] = 0;
-			cfg->trig_value1[i] = 0;
-			cfg->trig_edge0[i] = 0;
-			cfg->trig_edge1[i] = 0;
-			cfg->trig_count0[i] = 0;
-			cfg->trig_count1[i] = 0;
-			cfg->trig_logic0[i] = 2;
-			cfg->trig_logic1[i] = 2;
-		}
-		v16 = RL16(&cfg->mode);
-		v16 |= 1 << 0;
-		WL16(&cfg->mode, v16);
-	}
+	v16 = RL16(&cfg->mode);
+	v16 |= 1 << 0;
+	WL16(&cfg->mode, v16);
 
 	return SR_OK;
 }
@@ -260,6 +292,7 @@ SR_PRIV int dslogic_fpga_configure(const struct sr_dev_inst *sdi)
 	int transferred, len, ret;
 
 	sr_dbg("Configuring FPGA.");
+
 	usb = sdi->conn;
 	devc = sdi->priv;
 
@@ -293,7 +326,8 @@ SR_PRIV int dslogic_fpga_configure(const struct sr_dev_inst *sdi)
 			LIBUSB_ENDPOINT_OUT, DS_CMD_CONFIG, 0x0000, 0x0000,
 			c, 3, USB_TIMEOUT);
 	if (ret < 0) {
-		sr_err("Failed to send FPGA configure command: %s.", libusb_error_name(ret));
+		sr_err("Failed to send FPGA configure command: %s.",
+			libusb_error_name(ret));
 		return SR_ERR;
 	}
 
@@ -303,13 +337,15 @@ SR_PRIV int dslogic_fpga_configure(const struct sr_dev_inst *sdi)
 	 * 13	1 = loopback test mode
 	 * 12	1 = stream mode
 	 * 11	1 = serial trigger
-	 * 8-12	unused
+	 * 8-10 unused
 	 * 7	1 = analog mode
 	 * 6	1 = samplerate 400MHz
 	 * 5	1 = samplerate 200MHz or analog mode
 	 * 4	0 = logic, 1 = dso or analog
-	 * 2-3	unused
-	 * 1	0 = internal clock, 1 = external clock
+	 * 3	1 = RLE encoding (enable for more than 16 Megasamples)
+	 * 1-2	00 = internal clock,
+	 * 	01 = external clock rising,
+	 * 	11 = external clock falling
 	 * 0	1 = trigger enabled
 	 */
 	v16 = 0x0000;
@@ -319,11 +355,24 @@ SR_PRIV int dslogic_fpga_configure(const struct sr_dev_inst *sdi)
 		v16 = 1 << 14;
 	else if (devc->dslogic_mode == DS_OP_LOOPBACK_TEST)
 		v16 = 1 << 13;
-	//if (devc->dslogic_external_clock)
-	//	v16 |= 1 << 1;
-	//v16 |= 1 << 0;
+	if (devc->dslogic_continuous_mode)
+		v16 |= 1 << 12;
+	if (devc->dslogic_external_clock) {
+		v16 |= 1 << 1;
+		if (devc->dslogic_clock_edge == DS_EDGE_FALLING)
+			v16 |= 1 << 2;
+	}
+	if (devc->limit_samples > DS_MAX_LOGIC_DEPTH *
+		ceil(devc->cur_samplerate * 1.0 / DS_MAX_LOGIC_SAMPLERATE) 
+		&& !devc->dslogic_continuous_mode) {
+		/* Enable RLE for long captures.
+		 * Without this, captured data present errors.
+		 */
+		v16 |= 1 << 3;
+	}
+
 	WL16(&cfg.mode, v16);
-	v32 = ceil(SR_MHZ(100) * 1.0 / devc->cur_samplerate);
+	v32 = ceil(DS_MAX_LOGIC_SAMPLERATE * 1.0 / devc->cur_samplerate);
 	WL32(&cfg.divider, v32);
 	WL32(&cfg.count, devc->limit_samples);
 
@@ -339,3 +388,38 @@ SR_PRIV int dslogic_fpga_configure(const struct sr_dev_inst *sdi)
 
 	return SR_OK;
 }
+
+static int to_bytes_per_ms(struct dev_context *devc)
+{
+	if (devc->cur_samplerate > SR_MHZ(100))
+		return SR_MHZ(100) / 1000 * (devc->sample_wide ? 2 : 1);
+
+	return devc->cur_samplerate / 1000 * (devc->sample_wide ? 2 : 1);
+}
+
+static size_t get_buffer_size(struct dev_context *devc)
+{
+	size_t s;
+
+	/*
+	 * The buffer should be large enough to hold 10ms of data and
+	 * a multiple of 512.
+	 */
+	s = 10 * to_bytes_per_ms(devc);
+	// s = to_bytes_per_ms(devc->cur_samplerate);
+	return (s + 511) & ~511;
+}
+
+SR_PRIV int dslogic_get_number_of_transfers(struct dev_context *devc)
+{
+	unsigned int n;
+
+	/* Total buffer size should be able to hold about 100ms of data. */
+	n = (100 * to_bytes_per_ms(devc) / get_buffer_size(devc));
+	sr_info("New calculation: %d", n);
+
+	if (n > NUM_SIMUL_TRANSFERS)
+		return NUM_SIMUL_TRANSFERS;
+
+	return n;
+}