X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Funi-t-dmm%2Fapi.c;h=cb7c696611a2050d3d24385870485e5a0dda0314;hb=035a1078fda93cf1da37d19b3a1d95311b99b00f;hp=e96cf00aa399b3cf0767a25d945a524fdcdceb5e;hpb=34f06b903e3529a73feb7a6e74fae934a999f821;p=libsigrok.git

diff --git a/hardware/uni-t-dmm/api.c b/hardware/uni-t-dmm/api.c
index e96cf00a..cb7c6966 100644
--- a/hardware/uni-t-dmm/api.c
+++ b/hardware/uni-t-dmm/api.c
@@ -24,17 +24,19 @@
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
-static const int hwcaps[] = {
-	SR_HWCAP_MULTIMETER,
-	SR_HWCAP_LIMIT_SAMPLES,
-	SR_HWCAP_LIMIT_MSEC,
-	SR_HWCAP_CONTINUOUS,
+#define UNI_T_UT_D04_NEW "1a86.e008"
+
+static const int hwopts[] = {
+	SR_CONF_CONN,
 	0,
 };
 
-static const char *probe_names[] = {
-	"Probe",
-	NULL,
+static const int hwcaps[] = {
+	SR_CONF_MULTIMETER,
+	SR_CONF_LIMIT_SAMPLES,
+	SR_CONF_LIMIT_MSEC,
+	SR_CONF_CONTINUOUS,
+	0,
 };
 
 SR_PRIV struct sr_dev_driver uni_t_ut61d_driver_info;
@@ -55,7 +57,6 @@ static int clear_instances(void)
 
 static int hw_init(struct sr_context *sr_ctx, int dmm)
 {
-	int ret;
 	struct drv_context *drvc;
 
 	if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
@@ -63,18 +64,13 @@ static int hw_init(struct sr_context *sr_ctx, int dmm)
 		return SR_ERR_MALLOC;
 	}
 
-	if ((ret = libusb_init(NULL)) < 0) {
-		sr_err("Failed to initialize libusb: %s.",
-		       libusb_error_name(ret));
-		return SR_ERR;
-	}
-
 	if (dmm == UNI_T_UT61D)
 		di = di_ut61d;
 	else if (dmm == VOLTCRAFT_VC820)
 		di = di_vc820;
 	sr_dbg("Selected '%s' subdriver.", di->name);
 
+	drvc->sr_ctx = sr_ctx;
 	di->priv = drvc;
 
 	return SR_OK;
@@ -92,33 +88,49 @@ static int hw_init_vc820(struct sr_context *sr_ctx)
 
 static GSList *hw_scan(GSList *options)
 {
-	GSList *devices, *l;
+	GSList *usb_devices, *devices, *l;
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
 	struct drv_context *drvc;
+	struct sr_usb_dev_inst *usb;
+	struct sr_config *src;
 	struct sr_probe *probe;
-	struct libusb_device *ldev;
-	int i, devcnt;
+	const char *conn;
 
 	(void)options;
 
 	drvc = di->priv;
 
-	devices = NULL;
+	/* USB scan is always authoritative. */
+	clear_instances();
+
+	conn = NULL;
+	for (l = options; l; l = l->next) {
+		src = l->data;
+		switch (src->key) {
+		case SR_CONF_CONN:
+			conn = src->value;
+			break;
+		}
+	}
+	if (!conn)
+		conn = UNI_T_UT_D04_NEW;
 
-	if (!(l = sr_usb_connect(NULL, "1a86.e008")))
+	devices = NULL;
+	if (!(usb_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, conn))) {
+		g_slist_free_full(usb_devices, g_free);
 		return NULL;
+	}
 
-	for (i = 0; i < (int)g_slist_length(l); i++) {
-		ldev = (struct libusb_device *)l->data;
+	for (l = usb_devices; l; l = l->next) {
+		usb = l->data;
 
 		if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
 			sr_err("Device context malloc failed.");
 			return NULL;
 		}
 
-		devcnt = g_slist_length(drvc->instances);
-		if (!(sdi = sr_dev_inst_new(devcnt, SR_ST_INACTIVE,
+		if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE,
 				di->longname, NULL, NULL))) {
 			sr_err("sr_dev_inst_new returned NULL.");
 			return NULL;
@@ -128,10 +140,10 @@ static GSList *hw_scan(GSList *options)
 		if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
 			return NULL;
 		sdi->probes = g_slist_append(sdi->probes, probe);
-		devc->usb = sr_usb_dev_inst_new(
-				libusb_get_bus_number(ldev),
-				libusb_get_device_address(ldev), NULL);
-		drvc->instances = g_slist_append(drvc->instances, l->data);
+
+		devc->usb = usb;
+
+		drvc->instances = g_slist_append(drvc->instances, sdi);
 		devices = g_slist_append(devices, sdi);
 	}
 
@@ -149,11 +161,13 @@ static GSList *hw_dev_list(void)
 
 static int hw_dev_open(struct sr_dev_inst *sdi)
 {
+	struct drv_context *drvc;
 	struct dev_context *devc;
 
+	drvc = di->priv;
 	devc = sdi->priv;
 
-	return sr_usb_open(NULL, devc->usb);
+	return sr_usb_open(drvc->sr_ctx->libusb_ctx, devc->usb);
 }
 
 static int hw_dev_close(struct sr_dev_inst *sdi)
@@ -169,31 +183,23 @@ static int hw_cleanup(void)
 {
 	clear_instances();
 
-	// libusb_exit(NULL);
-
 	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)
 {
 	(void)sdi;
 
-	sr_spew("Backend requested info_id %d.", info_id);
+	sr_spew("Backend requested info_id %d.", id);
 
-	switch (info_id) {
+	switch (id) {
+	case SR_DI_HWOPTS:
+		*data = hwopts;
+		break;
 	case SR_DI_HWCAPS:
 		*data = hwcaps;
 		sr_spew("%s: Returning hwcaps.", __func__);
 		break;
-	case SR_DI_NUM_PROBES:
-		*data = GINT_TO_POINTER(1);
-		sr_spew("%s: Returning number of probes.", __func__);
-		break;
-	case SR_DI_PROBE_NAMES:
-		*data = probe_names;
-		sr_spew("%s: Returning probe names.", __func__);
-		break;
 	case SR_DI_SAMPLERATES:
 		/* TODO: Get rid of this. */
 		*data = NULL;
@@ -207,7 +213,6 @@ static int hw_info_get(int info_id, const void **data,
 		return SR_ERR_ARG;
 		break;
 	default:
-		sr_err("%s: Unknown info_id %d.", __func__, info_id);
 		return SR_ERR_ARG;
 		break;
 	}
@@ -215,15 +220,14 @@ 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;
 
 	devc = sdi->priv;
 
-	switch (hwcap) {
-	case SR_HWCAP_LIMIT_MSEC:
+	switch (id) {
+	case SR_CONF_LIMIT_MSEC:
 		/* TODO: Not yet implemented. */
 		if (*(const uint64_t *)value == 0) {
 			sr_err("Time limit cannot be 0.");
@@ -233,7 +237,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 		sr_dbg("Setting time limit to %" PRIu64 "ms.",
 		       devc->limit_msec);
 		break;
-	case SR_HWCAP_LIMIT_SAMPLES:
+	case SR_CONF_LIMIT_SAMPLES:
 		if (*(const uint64_t *)value == 0) {
 			sr_err("Sample limit cannot be 0.");
 			return SR_ERR;
@@ -243,7 +247,7 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 		       devc->limit_samples);
 		break;
 	default:
-		sr_err("Unknown capability: %d.", hwcap);
+		sr_err("Unknown capability: %d.", id);
 		return SR_ERR;
 		break;
 	}
@@ -256,7 +260,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 {
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_header header;
-	struct sr_datafeed_meta_analog meta;
 	struct dev_context *devc;
 
 	devc = sdi->priv;
@@ -273,13 +276,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	gettimeofday(&header.starttime, NULL);
 	sr_session_send(devc->cb_data, &packet);
 
-	/* Send metadata about the SR_DF_ANALOG packets to come. */
-	sr_dbg("Sending SR_DF_META_ANALOG.");
-	packet.type = SR_DF_META_ANALOG;
-	packet.payload = &meta;
-	meta.num_probes = 1;
-	sr_session_send(devc->cb_data, &packet);
-
 	if (!strcmp(di->name, "uni-t-ut61d")) {
 		sr_source_add(0, 0, 10 /* poll_timeout */,
 			      uni_t_ut61d_receive_data, (void *)sdi);
@@ -319,10 +315,10 @@ SR_PRIV struct sr_dev_driver uni_t_ut61d_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,
@@ -337,10 +333,10 @@ SR_PRIV struct sr_dev_driver voltcraft_vc820_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,