X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-dso%2Fapi.c;h=a3cc8a283304ae233ebb1c857ad13eb08be2e094;hb=50bc52f3a6102ad687c8abe11cf1e39ab44b1e6a;hp=5f495a1cf9a549f0850d2a070c9dd1a71cb1d560;hpb=11e33196560a753b8af2486780dcb5f427a89177;p=libsigrok.git

diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c
index 5f495a1c..a3cc8a28 100644
--- a/src/hardware/hantek-dso/api.c
+++ b/src/hardware/hantek-dso/api.c
@@ -55,15 +55,16 @@ static const uint32_t drvopts[] = {
 static const uint32_t devopts[] = {
 	SR_CONF_CONTINUOUS,
 	SR_CONF_CONN | SR_CONF_GET,
-	SR_CONF_LIMIT_FRAMES | SR_CONF_SET,
+	SR_CONF_LIMIT_FRAMES | SR_CONF_GET | SR_CONF_SET,
 	SR_CONF_TIMEBASE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 	SR_CONF_NUM_HDIV | SR_CONF_GET,
-	SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_GET | SR_CONF_SET,
+	SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET,
 	SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 	SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET,
 	SR_CONF_BUFFERSIZE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 	SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 	SR_CONF_NUM_VDIV | SR_CONF_GET,
+	SR_CONF_TRIGGER_LEVEL | SR_CONF_GET | SR_CONF_SET,
 };
 
 static const uint32_t devopts_cg[] = {
@@ -147,7 +148,7 @@ static const uint64_t samplerates[] = {
 	SR_MHZ(50),
 	SR_MHZ(100),
 	SR_MHZ(125),
-	/* fast mode not supported yet 
+	/* Fast mode not supported yet.
 	SR_MHZ(200),
 	SR_MHZ(250), */
 };
@@ -221,7 +222,7 @@ static struct sr_dev_inst *dso_dev_new(const struct dso_profile *prof)
 	devc->framesize = DEFAULT_FRAMESIZE;
 	devc->triggerslope = SLOPE_POSITIVE;
 	devc->triggersource = g_strdup(DEFAULT_TRIGGER_SOURCE);
-	devc->triggerposition = DEFAULT_HORIZ_TRIGGERPOS;
+	devc->capture_ratio = DEFAULT_CAPTURE_RATIO;
 	sdi->priv = devc;
 
 	return sdi;
@@ -237,6 +238,7 @@ static int configure_channels(const struct sr_dev_inst *sdi)
 	devc = sdi->priv;
 
 	g_slist_free(devc->enabled_channels);
+	devc->enabled_channels = NULL;
 	devc->ch_enabled[0] = devc->ch_enabled[1] = FALSE;
 	for (l = sdi->channels, p = 0; l; l = l->next, p++) {
 		ch = l->data;
@@ -313,7 +315,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 		libusb_get_device_descriptor(devlist[i], &des);
 
-		usb_get_port_path(devlist[i], connection_id, sizeof(connection_id));
+		if (usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)) < 0)
+			continue;
 
 		prof = NULL;
 		for (j = 0; dev_profiles[j].orig_vid; j++) {
@@ -327,11 +330,12 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 				devices = g_slist_append(devices, sdi);
 				devc = sdi->priv;
 				if (ezusb_upload_firmware(drvc->sr_ctx, devlist[i],
-						USB_CONFIGURATION, prof->firmware) == SR_OK)
+						USB_CONFIGURATION, prof->firmware) == SR_OK) {
 					/* Remember when the firmware on this device was updated */
 					devc->fw_updated = g_get_monotonic_time();
-				else
-					sr_err("Firmware upload failed");
+				} else {
+					sr_err("Firmware upload failed, name %s", prof->firmware);
+				}
 				/* Dummy USB address of 0xff will get overwritten later. */
 				sdi->conn = sr_usb_dev_inst_new(
 						libusb_get_bus_number(devlist[i]), 0xff, NULL);
@@ -440,6 +444,9 @@ static int config_get(uint32_t key, GVariant **data,
 	devc = sdi->priv;
 	if (!cg) {
 		switch (key) {
+		case SR_CONF_TRIGGER_LEVEL:
+			*data = g_variant_new_double(devc->voffset_trigger);
+			break;
 		case SR_CONF_CONN:
 			if (!sdi->conn)
 				return SR_ERR_ARG;
@@ -467,8 +474,11 @@ static int config_get(uint32_t key, GVariant **data,
 			s = (devc->triggerslope == SLOPE_POSITIVE) ? "r" : "f";
 			*data = g_variant_new_string(s);
 			break;
-		case SR_CONF_HORIZ_TRIGGERPOS:
-			*data = g_variant_new_double(devc->triggerposition);
+		case SR_CONF_CAPTURE_RATIO:
+			*data = g_variant_new_uint64(devc->capture_ratio);
+			break;
+		case SR_CONF_LIMIT_FRAMES:
+			*data = g_variant_new_uint64(devc->limit_frames);
 			break;
 		default:
 			return SR_ERR_NA;
@@ -501,8 +511,8 @@ static int config_set(uint32_t key, GVariant *data,
 	const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
-	double tmp_double;
 	int ch_idx, idx;
+	float flt;
 
 	devc = sdi->priv;
 	if (!cg) {
@@ -510,18 +520,23 @@ static int config_set(uint32_t key, GVariant *data,
 		case SR_CONF_LIMIT_FRAMES:
 			devc->limit_frames = g_variant_get_uint64(data);
 			break;
+		case SR_CONF_TRIGGER_LEVEL:
+			flt = g_variant_get_double(data);
+			if (flt < 0.0 || flt > 1.0) {
+				sr_err("Trigger level must be in [0.0,1.0].");
+				return SR_ERR_ARG;
+			}
+			devc->voffset_trigger = flt;
+			if (dso_set_voffsets(sdi) != SR_OK)
+				return SR_ERR;
+			break;
 		case SR_CONF_TRIGGER_SLOPE:
 			if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_slopes))) < 0)
 				return SR_ERR_ARG;
 			devc->triggerslope = idx;
 			break;
-		case SR_CONF_HORIZ_TRIGGERPOS:
-			tmp_double = g_variant_get_double(data);
-			if (tmp_double < 0.0 || tmp_double > 1.0) {
-				sr_err("Trigger position should be between 0.0 and 1.0.");
-				return SR_ERR_ARG;
-			} else
-				devc->triggerposition = tmp_double;
+		case SR_CONF_CAPTURE_RATIO:
+			devc->capture_ratio = g_variant_get_uint64(data);
 			break;
 		case SR_CONF_BUFFERSIZE:
 			if ((idx = std_u64_idx(data, devc->profile->buffersizes, NUM_BUFFER_SIZES)) < 0)
@@ -692,7 +707,6 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
  */
 static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
 {
-	struct sr_datafeed_packet packet;
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
 	int num_samples, pre;
@@ -766,12 +780,13 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
 		sr_dbg("End of frame, sending %d pre-trigger buffered samples.",
 			devc->samp_buffered);
 		send_chunk(sdi, devc->framebuf, devc->samp_buffered);
+		g_free(devc->framebuf);
+		devc->framebuf = NULL;
 
 		/* Mark the end of this frame. */
-		packet.type = SR_DF_FRAME_END;
-		sr_session_send(sdi, &packet);
+		std_session_send_df_frame_end(sdi);
 
-		if (devc->limit_frames && ++devc->num_frames == devc->limit_frames) {
+		if (devc->limit_frames && ++devc->num_frames >= devc->limit_frames) {
 			/* Terminate session */
 			devc->dev_state = STOPPING;
 		} else {
@@ -783,7 +798,6 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
 static int handle_event(int fd, int revents, void *cb_data)
 {
 	const struct sr_dev_inst *sdi;
-	struct sr_datafeed_packet packet;
 	struct timeval tv;
 	struct sr_dev_driver *di;
 	struct dev_context *devc;
@@ -856,7 +870,7 @@ static int handle_event(int fd, int revents, void *cb_data)
 		/* No data yet. */
 		break;
 	case CAPTURE_READY_8BIT:
-	case CAPTURE_READY2250:
+	case CAPTURE_READY_2250:
 		/* Remember where in the captured frame the trigger is. */
 		devc->trigger_offset = trigger_offset;
 
@@ -875,8 +889,7 @@ static int handle_event(int fd, int revents, void *cb_data)
 		devc->dev_state = FETCH_DATA;
 
 		/* Tell the frontend a new frame is on the way. */
-		packet.type = SR_DF_FRAME_BEGIN;
-		sr_session_send(sdi, &packet);
+		std_session_send_df_frame_begin(sdi);
 		break;
 	case CAPTURE_READY_9BIT:
 		/* TODO */
@@ -926,6 +939,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 
 	devc = sdi->priv;
 	devc->dev_state = STOPPING;
+	devc->num_frames = 0;
 
 	return SR_OK;
 }