X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fhantek-dso%2Fapi.c;h=a23161cbf14cd27a6ef233394accfa197c5b4a7e;hb=c5fb502f9773ecf6df83a32ab82bcd1b70fa857f;hp=01a080017e2eae8339a828e0c295e97adf3467d1;hpb=d4928d7102c6b2f9f7aa51a1b98669bf148fff80;p=libsigrok.git

diff --git a/hardware/hantek-dso/api.c b/hardware/hantek-dso/api.c
index 01a08001..a23161cb 100644
--- a/hardware/hantek-dso/api.c
+++ b/hardware/hantek-dso/api.c
@@ -38,23 +38,22 @@
 #define TICK 1
 
 static const int hwcaps[] = {
-	SR_HWCAP_OSCILLOSCOPE,
-	SR_HWCAP_LIMIT_SAMPLES,
-	SR_HWCAP_CONTINUOUS,
-	SR_HWCAP_TIMEBASE,
-	SR_HWCAP_BUFFERSIZE,
-	SR_HWCAP_TRIGGER_SOURCE,
-	SR_HWCAP_TRIGGER_SLOPE,
-	SR_HWCAP_HORIZ_TRIGGERPOS,
-	SR_HWCAP_FILTER,
-	SR_HWCAP_VDIV,
-	SR_HWCAP_COUPLING,
+	SR_CONF_OSCILLOSCOPE,
+	SR_CONF_LIMIT_SAMPLES,
+	SR_CONF_CONTINUOUS,
+	SR_CONF_TIMEBASE,
+	SR_CONF_BUFFERSIZE,
+	SR_CONF_TRIGGER_SOURCE,
+	SR_CONF_TRIGGER_SLOPE,
+	SR_CONF_HORIZ_TRIGGERPOS,
+	SR_CONF_FILTER,
+	SR_CONF_VDIV,
+	SR_CONF_COUPLING,
 	0,
 };
 
 static const char *probe_names[] = {
-	"CH1",
-	"CH2",
+	"CH1", "CH2",
 	NULL,
 };
 
@@ -143,7 +142,7 @@ static const char *coupling[] = {
 };
 
 SR_PRIV struct sr_dev_driver hantek_dso_driver_info;
-static struct sr_dev_driver *hdi = &hantek_dso_driver_info;
+static struct sr_dev_driver *di = &hantek_dso_driver_info;
 
 static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data);
 
@@ -159,7 +158,7 @@ static struct sr_dev_inst *dso_dev_new(int index, const struct dso_profile *prof
 		prof->vendor, prof->model, NULL);
 	if (!sdi)
 		return NULL;
-	sdi->driver = hdi;
+	sdi->driver = di;
 
 	/*
 	 * Add only the real probes -- EXT isn't a source of data, only
@@ -194,7 +193,7 @@ static struct sr_dev_inst *dso_dev_new(int index, const struct dso_profile *prof
 	devc->triggersource = g_strdup(DEFAULT_TRIGGER_SOURCE);
 	devc->triggerposition = DEFAULT_HORIZ_TRIGGERPOS;
 	sdi->priv = devc;
-	drvc = hdi->priv;
+	drvc = di->priv;
 	drvc->instances = g_slist_append(drvc->instances, sdi);
 
 	return sdi;
@@ -203,18 +202,22 @@ static struct sr_dev_inst *dso_dev_new(int index, const struct dso_profile *prof
 static int configure_probes(const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
-	const struct sr_probe *probe;
+	struct sr_probe *probe;
 	const GSList *l;
+	int p;
 
 	devc = sdi->priv;
 
+	g_slist_free(devc->enabled_probes);
 	devc->ch1_enabled = devc->ch2_enabled = FALSE;
-	for (l = sdi->probes; l; l = l->next) {
-		probe = (struct sr_probe *)l->data;
-		if (probe->index == 0)
+	for (l = sdi->probes, p = 0; l; l = l->next, p++) {
+		probe = l->data;
+		if (p == 0)
 			devc->ch1_enabled = probe->enabled;
-		else if (probe->index == 1)
+		else
 			devc->ch2_enabled = probe->enabled;
+		if (probe->enabled)
+			devc->enabled_probes = g_slist_append(devc->enabled_probes, probe);
 	}
 
 	return SR_OK;
@@ -228,7 +231,7 @@ static int clear_instances(void)
 	struct dev_context *devc;
 	GSList *l;
 
-	drvc = hdi->priv;
+	drvc = di->priv;
 	for (l = drvc->instances; l; l = l->next) {
 		if (!(sdi = l->data)) {
 			/* Log error, but continue cleaning up the rest. */
@@ -243,6 +246,7 @@ static int clear_instances(void)
 		dso_close(sdi);
 		sr_usb_dev_inst_free(devc->usb);
 		g_free(devc->triggersource);
+		g_slist_free(devc->enabled_probes);
 
 		sr_dev_inst_free(sdi);
 	}
@@ -263,7 +267,7 @@ static int hw_init(struct sr_context *sr_ctx)
 	}
 
 	drvc->sr_ctx = sr_ctx;
-	hdi->priv = drvc;
+	di->priv = drvc;
 
 	return SR_OK;
 }
@@ -283,7 +287,7 @@ static GSList *hw_scan(GSList *options)
 
 	devcnt = 0;
 	devices = 0;
-	drvc = hdi->priv;
+	drvc = di->priv;
 	drvc->instances = NULL;
 
 	clear_instances();
@@ -348,7 +352,7 @@ static GSList *hw_dev_list(void)
 {
 	struct drv_context *drvc;
 
-	drvc = hdi->priv;
+	drvc = di->priv;
 
 	return drvc->instances;
 }
@@ -410,7 +414,7 @@ static int hw_cleanup(void)
 {
 	struct drv_context *drvc;
 
-	if (!(drvc = hdi->priv))
+	if (!(drvc = di->priv))
 		return SR_OK;
 
 	clear_instances();
@@ -418,23 +422,16 @@ static int hw_cleanup(void)
 	return SR_OK;
 }
 
-static int hw_info_get(int info_id, const void **data,
-		       const struct sr_dev_inst *sdi)
+static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
 {
 	uint64_t tmp;
 
 	(void)sdi;
 
-	switch (info_id) {
+	switch (id) {
 	case SR_DI_HWCAPS:
 		*data = hwcaps;
 		break;
-	case SR_DI_NUM_PROBES:
-		*data = GINT_TO_POINTER(NUM_PROBES);
-		break;
-	case SR_DI_PROBE_NAMES:
-		*data = probe_names;
-		break;
 	case SR_DI_BUFFERSIZES:
 		*data = buffersizes;
 		break;
@@ -464,8 +461,7 @@ static int hw_info_get(int info_id, const void **data,
 	return SR_OK;
 }
 
-static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
-			     const void *value)
+static int config_set(int id, const void *value, const struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
 	struct sr_rational tmp_rat;
@@ -479,17 +475,17 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 
 	ret = SR_OK;
 	devc = sdi->priv;
-	switch (hwcap) {
-	case SR_HWCAP_LIMIT_FRAMES:
+	switch (id) {
+	case SR_CONF_LIMIT_FRAMES:
 		devc->limit_frames = *(const uint64_t *)value;
 		break;
-	case SR_HWCAP_TRIGGER_SLOPE:
+	case SR_CONF_TRIGGER_SLOPE:
 		tmp_u64 = *(const int *)value;
 		if (tmp_u64 != SLOPE_NEGATIVE && tmp_u64 != SLOPE_POSITIVE)
 			ret = SR_ERR_ARG;
 		devc->triggerslope = tmp_u64;
 		break;
-	case SR_HWCAP_HORIZ_TRIGGERPOS:
+	case SR_CONF_HORIZ_TRIGGERPOS:
 		tmp_float = *(const float *)value;
 		if (tmp_float < 0.0 || tmp_float > 1.0) {
 			sr_err("Trigger position should be between 0.0 and 1.0.");
@@ -497,7 +493,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 		} else
 			devc->triggerposition = tmp_float;
 		break;
-	case SR_HWCAP_BUFFERSIZE:
+	case SR_CONF_BUFFERSIZE:
 		tmp_u64 = *(const int *)value;
 		for (i = 0; buffersizes[i]; i++) {
 			if (buffersizes[i] == tmp_u64) {
@@ -508,7 +504,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 		if (buffersizes[i] == 0)
 			ret = SR_ERR_ARG;
 		break;
-	case SR_HWCAP_TIMEBASE:
+	case SR_CONF_TIMEBASE:
 		tmp_rat = *(const struct sr_rational *)value;
 		for (i = 0; timebases[i].p && timebases[i].q; i++) {
 			if (timebases[i].p == tmp_rat.p
@@ -520,7 +516,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 		if (timebases[i].p == 0 && timebases[i].q == 0)
 			ret = SR_ERR_ARG;
 		break;
-	case SR_HWCAP_TRIGGER_SOURCE:
+	case SR_CONF_TRIGGER_SOURCE:
 		for (i = 0; trigger_sources[i]; i++) {
 			if (!strcmp(value, trigger_sources[i])) {
 				devc->triggersource = g_strdup(value);
@@ -530,7 +526,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 		if (trigger_sources[i] == 0)
 			ret = SR_ERR_ARG;
 		break;
-	case SR_HWCAP_FILTER:
+	case SR_CONF_FILTER:
 		devc->filter_ch1 = devc->filter_ch2 = devc->filter_trigger = 0;
 		targets = g_strsplit(value, ",", 0);
 		for (i = 0; targets[i]; i++) {
@@ -550,7 +546,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 		}
 		g_strfreev(targets);
 		break;
-	case SR_HWCAP_VDIV:
+	case SR_CONF_VDIV:
 		/* TODO: Not supporting vdiv per channel yet. */
 		tmp_rat = *(const struct sr_rational *)value;
 		for (i = 0; vdivs[i].p && vdivs[i].q; i++) {
@@ -564,7 +560,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 		if (vdivs[i].p == 0 && vdivs[i].q == 0)
 			ret = SR_ERR_ARG;
 		break;
-	case SR_HWCAP_COUPLING:
+	case SR_CONF_COUPLING:
 		/* TODO: Not supporting coupling per channel yet. */
 		for (i = 0; coupling[i]; i++) {
 			if (!strcmp(value, coupling[i])) {
@@ -584,18 +580,21 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 	return ret;
 }
 
-static void send_chunk(struct dev_context *devc, unsigned char *buf,
+static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
 		int num_samples)
 {
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_analog analog;
+	struct dev_context *devc;
 	float ch1, ch2, range;
 	int num_probes, data_offset, i;
 
+	devc = sdi->priv;
 	num_probes = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1;
 	packet.type = SR_DF_ANALOG;
 	packet.payload = &analog;
 	/* TODO: support for 5xxx series 9-bit samples */
+	analog.probes = devc->enabled_probes;
 	analog.num_samples = num_samples;
 	analog.mq = SR_MQ_VOLTAGE;
 	analog.unit = SR_UNIT_VOLT;
@@ -642,10 +641,12 @@ static void send_chunk(struct dev_context *devc, unsigned char *buf,
 static void receive_transfer(struct libusb_transfer *transfer)
 {
 	struct sr_datafeed_packet packet;
+	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
 	int num_samples, pre;
 
-	devc = transfer->user_data;
+	sdi = transfer->user_data;
+	devc = sdi->priv;
 	sr_dbg("receive_transfer(): status %d received %d bytes.",
 	       transfer->status, transfer->actual_length);
 
@@ -692,12 +693,12 @@ static void receive_transfer(struct libusb_transfer *transfer)
 			/* Avoid the corner case where the chunk ended at
 			 * exactly the trigger point. */
 			if (num_samples > pre)
-				send_chunk(devc, transfer->buffer + pre * 2,
+				send_chunk(sdi, transfer->buffer + pre * 2,
 						num_samples - pre);
 		}
 	} else {
 		/* Already past the trigger point, just send it all out. */
-		send_chunk(devc, transfer->buffer,
+		send_chunk(sdi, transfer->buffer,
 				num_samples);
 	}
 
@@ -713,7 +714,7 @@ static void receive_transfer(struct libusb_transfer *transfer)
 		 * pre-trigger samples out now, in one big chunk. */
 		sr_dbg("End of frame, sending %d pre-trigger buffered samples.",
 		       devc->samp_buffered);
-		send_chunk(devc, devc->framebuf, devc->samp_buffered);
+		send_chunk(sdi, devc->framebuf, devc->samp_buffered);
 
 		/* Mark the end of this frame. */
 		packet.type = SR_DF_FRAME_END;
@@ -734,7 +735,7 @@ static int handle_event(int fd, int revents, void *cb_data)
 	struct sr_datafeed_packet packet;
 	struct timeval tv;
 	struct dev_context *devc;
-	struct drv_context *drvc = hdi->priv;
+	struct drv_context *drvc = di->priv;
 	const struct libusb_pollfd **lupfd;
 	int num_probes, i;
 	uint32_t trigger_offset;
@@ -815,7 +816,7 @@ static int handle_event(int fd, int revents, void *cb_data)
 		devc->samp_buffered = devc->samp_received = 0;
 
 		/* Tell the scope to send us the first frame. */
-		if (dso_get_channeldata(devc, receive_transfer) != SR_OK)
+		if (dso_get_channeldata(sdi, receive_transfer) != SR_OK)
 			break;
 
 		/*
@@ -849,9 +850,8 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	const struct libusb_pollfd **lupfd;
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_header header;
-	struct sr_datafeed_meta_analog meta;
 	struct dev_context *devc;
-	struct drv_context *drvc = hdi->priv;
+	struct drv_context *drvc = di->priv;
 	int i;
 
 	if (sdi->status != SR_ST_ACTIVE)
@@ -885,12 +885,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	gettimeofday(&header.starttime, NULL);
 	sr_session_send(cb_data, &packet);
 
-	/* Send metadata about the SR_DF_ANALOG packets to come. */
-	packet.type = SR_DF_META_ANALOG;
-	packet.payload = &meta;
-	meta.num_probes = NUM_PROBES;
-	sr_session_send(cb_data, &packet);
-
 	return SR_OK;
 }
 
@@ -918,10 +912,10 @@ SR_PRIV struct sr_dev_driver hantek_dso_driver_info = {
 	.scan = hw_scan,
 	.dev_list = hw_dev_list,
 	.dev_clear = clear_instances,
+	.config_get = config_get,
+	.config_set = config_set,
 	.dev_open = hw_dev_open,
 	.dev_close = hw_dev_close,
-	.info_get = hw_info_get,
-	.dev_config_set = hw_dev_config_set,
 	.dev_acquisition_start = hw_dev_acquisition_start,
 	.dev_acquisition_stop = hw_dev_acquisition_stop,
 	.priv = NULL,