X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Funi-t-dmm%2Fapi.c;h=26b3e16e7a8fe6327cd8dd2f43f62fb32747de66;hb=6a4710fac267c07cc146b2a3cd23204b08bea552;hp=634af3ccce98d6b094d027920cae467545d22fbb;hpb=79081ec80c79801c439a1a3756cf5426af0739b8;p=libsigrok.git

diff --git a/hardware/uni-t-dmm/api.c b/hardware/uni-t-dmm/api.c
index 634af3cc..26b3e16e 100644
--- a/hardware/uni-t-dmm/api.c
+++ b/hardware/uni-t-dmm/api.c
@@ -24,166 +24,127 @@
 #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_dmm_driver_info;
-static struct sr_dev_driver *di = &uni_t_dmm_driver_info;
+SR_PRIV struct sr_dev_driver uni_t_ut61d_driver_info;
+SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info;
+
+static struct sr_dev_driver *di_ut61d = &uni_t_ut61d_driver_info;
+static struct sr_dev_driver *di_vc820 = &voltcraft_vc820_driver_info;
 
-static int open_usb(struct sr_dev_inst *sdi)
+/* After hw_init() this will point to a device-specific entry (see above). */
+static struct sr_dev_driver *di = NULL;
+
+static int clear_instances(void)
 {
-	libusb_device **devlist;
-	struct libusb_device_descriptor des;
-	struct dev_context *devc;
-	int ret, tmp, cnt, i;
+	/* TODO: Use common code later. */
 
-	/* TODO: Use common code later, refactor. */
+	return SR_OK;
+}
 
-	devc = sdi->priv;
+static int hw_init(struct sr_context *sr_ctx, int dmm)
+{
+	struct drv_context *drvc;
 
-	if ((cnt = libusb_get_device_list(NULL, &devlist)) < 0) {
-		sr_err("Error getting USB device list: %d.", cnt);
-		return SR_ERR;
+	if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
+		sr_err("Driver context malloc failed.");
+		return SR_ERR_MALLOC;
 	}
 
-	ret = SR_ERR;
-	for (i = 0; i < cnt; i++) {
-		if ((tmp = libusb_get_device_descriptor(devlist[i], &des))) {
-			sr_err("Failed to get device descriptor: %d.", tmp);
-			continue;
-		}
+	if (dmm == UNI_T_UT61D)
+		di = di_ut61d;
+	else if (dmm == VOLTCRAFT_VC820)
+		di = di_vc820;
+	sr_dbg("Selected '%s' subdriver.", di->name);
 
-		if (libusb_get_bus_number(devlist[i]) != devc->usb->bus
-			|| libusb_get_device_address(devlist[i]) != devc->usb->address)
-			continue;
+	drvc->sr_ctx = sr_ctx;
+	di->priv = drvc;
 
-		if ((tmp = libusb_open(devlist[i], &devc->usb->devhdl))) {
-			sr_err("Failed to open device: %d.", tmp);
-			break;
-		}
+	return SR_OK;
+}
 
-		sr_info("Opened USB device on %d.%d.",
-			devc->usb->bus, devc->usb->address);
-		ret = SR_OK;
-		break;
-	}
-	libusb_free_device_list(devlist, 1);
+static int hw_init_ut61d(struct sr_context *sr_ctx)
+{
+	return hw_init(sr_ctx, UNI_T_UT61D);
+}
 
-	return ret;
+static int hw_init_vc820(struct sr_context *sr_ctx)
+{
+	return hw_init(sr_ctx, VOLTCRAFT_VC820);
 }
 
-static GSList *connect_usb(const char *conn)
+static GSList *hw_scan(GSList *options)
 {
+	GSList *usb_devices, *devices, *l;
 	struct sr_dev_inst *sdi;
-	struct drv_context *drvc;
 	struct dev_context *devc;
+	struct drv_context *drvc;
+	struct sr_usb_dev_inst *usb;
+	struct sr_config *src;
 	struct sr_probe *probe;
-	libusb_device **devlist;
-	struct libusb_device_descriptor des;
-	GSList *devices;
-	int vid, pid, devcnt, err, i;
-
-	(void)conn;
+	const char *conn;
 
-	/* TODO: Use common code later, refactor. */
+	(void)options;
 
 	drvc = di->priv;
 
-	/* Hardcoded for now. */
-	vid = UT_D04_CABLE_USB_VID;
-	pid = UT_D04_CABLE_USB_DID;
+	/* 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;
 
 	devices = NULL;
-	libusb_get_device_list(NULL, &devlist);
-	for (i = 0; devlist[i]; i++) {
-		if ((err = libusb_get_device_descriptor(devlist[i], &des))) {
-			sr_err("Failed to get device descriptor: %d", err);
-			continue;
-		}
+	if (!(usb_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, conn))) {
+		g_slist_free_full(usb_devices, g_free);
+		return NULL;
+	}
 
-		if (des.idVendor != vid || des.idProduct != pid)
-			continue;
+	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,
-					    "UNI-T DMM", NULL, NULL))) {
+		if (!(sdi = sr_dev_inst_new(0, SR_ST_INACTIVE,
+				di->longname, NULL, NULL))) {
 			sr_err("sr_dev_inst_new returned NULL.");
 			return NULL;
 		}
 		sdi->priv = devc;
+		sdi->driver = di;
 		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(devlist[i]),
-				libusb_get_device_address(devlist[i]), NULL);
-		devices = g_slist_append(devices, sdi);
-	}
-	libusb_free_device_list(devlist, 1);
 
-	return devices;
-}
-
-static int clear_instances(void)
-{
-	/* TODO: Use common code later. */
-
-	return SR_OK;
-}
-
-static int hw_init(void)
-{
-	int ret;
-	struct drv_context *drvc;
-
-	if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) {
-		sr_err("Driver context malloc failed.");
-		return SR_ERR_MALLOC;
-	}
-
-	if ((ret = libusb_init(NULL)) < 0) {
-		sr_err("Failed to initialize libusb: %s.",
-		       libusb_error_name(ret));
-		return SR_ERR;
-	}
-
-	di->priv = drvc;
-
-	return SR_OK;
-}
+		devc->usb = usb;
 
-static GSList *hw_scan(GSList *options)
-{
-	GSList *l, *devices;
-	struct sr_dev_inst *sdi;
-	struct drv_context *drvc;
-
-	(void)options;
-
-	drvc = di->priv;
-
-	if (!(devices = connect_usb(NULL)))
-		return NULL;
-
-	for (l = devices; l; l = l->next) {
-		sdi = l->data;
-		sdi->driver = di;
-		drvc->instances = g_slist_append(drvc->instances, l->data);
+		drvc->instances = g_slist_append(drvc->instances, sdi);
+		devices = g_slist_append(devices, sdi);
 	}
 
 	return devices;
@@ -200,7 +161,13 @@ static GSList *hw_dev_list(void)
 
 static int hw_dev_open(struct sr_dev_inst *sdi)
 {
-	return open_usb(sdi);
+	struct drv_context *drvc;
+	struct dev_context *devc;
+
+	drvc = di->priv;
+	devc = sdi->priv;
+
+	return sr_usb_open(drvc->sr_ctx->libusb_ctx, devc->usb);
 }
 
 static int hw_dev_close(struct sr_dev_inst *sdi)
@@ -216,61 +183,17 @@ 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)
-{
-	(void)sdi;
-
-	sr_spew("Backend requested info_id %d.", info_id);
-
-	switch (info_id) {
-	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;
-		sr_spew("%s: Returning samplerates.", __func__);
-		return SR_ERR_ARG;
-		break;
-	case SR_DI_CUR_SAMPLERATE:
-		/* TODO: Get rid of this. */
-		*data = NULL;
-		sr_spew("%s: Returning current samplerate.", __func__);
-		return SR_ERR_ARG;
-		break;
-	default:
-		sr_err("%s: Unknown info_id %d.", __func__, info_id);
-		return SR_ERR_ARG;
-		break;
-	}
-
-	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.");
@@ -280,7 +203,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;
@@ -290,7 +213,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;
 	}
@@ -298,12 +221,30 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 	return SR_OK;
 }
 
+static int config_list(int key, const void **data, const struct sr_dev_inst *sdi)
+{
+
+	(void)sdi;
+
+	switch (key) {
+	case SR_CONF_SCAN_OPTIONS:
+		*data = hwopts;
+		break;
+	case SR_CONF_DEVICE_OPTIONS:
+		*data = hwcaps;
+		break;
+	default:
+		return SR_ERR_ARG;
+	}
+
+	return SR_OK;
+}
+
 static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 				    void *cb_data)
 {
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_header header;
-	struct sr_datafeed_meta_analog meta;
 	struct dev_context *devc;
 
 	devc = sdi->priv;
@@ -320,21 +261,18 @@ 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);
-
-	sr_source_add(0, 0, 10 /* poll_timeout */,
-		      uni_t_dmm_receive_data, (void *)sdi);
+	if (!strcmp(di->name, "uni-t-ut61d")) {
+		sr_source_add(0, 0, 10 /* poll_timeout */,
+			      uni_t_ut61d_receive_data, (void *)sdi);
+	} else if (!strcmp(di->name, "voltcraft-vc820")) {
+		sr_source_add(0, 0, 10 /* poll_timeout */,
+			      voltcraft_vc820_receive_data, (void *)sdi);
+	}
 
 	return SR_OK;
 }
 
-static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
-				   void *cb_data)
+static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
 	struct sr_datafeed_packet packet;
 
@@ -353,19 +291,37 @@ static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
 	return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver uni_t_dmm_driver_info = {
-	.name = "uni-t-dmm",
-	.longname = "UNI-T DMM series",
+SR_PRIV struct sr_dev_driver uni_t_ut61d_driver_info = {
+	.name = "uni-t-ut61d",
+	.longname = "UNI-T UT61D",
+	.api_version = 1,
+	.init = hw_init_ut61d,
+	.cleanup = hw_cleanup,
+	.scan = hw_scan,
+	.dev_list = hw_dev_list,
+	.dev_clear = clear_instances,
+	.config_set = config_set,
+	.config_list = config_list,
+	.dev_open = hw_dev_open,
+	.dev_close = hw_dev_close,
+	.dev_acquisition_start = hw_dev_acquisition_start,
+	.dev_acquisition_stop = hw_dev_acquisition_stop,
+	.priv = NULL,
+};
+
+SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info = {
+	.name = "voltcraft-vc820",
+	.longname = "Voltcraft VC-820",
 	.api_version = 1,
-	.init = hw_init,
+	.init = hw_init_vc820,
 	.cleanup = hw_cleanup,
 	.scan = hw_scan,
 	.dev_list = hw_dev_list,
 	.dev_clear = clear_instances,
+	.config_set = config_set,
+	.config_list = config_list,
 	.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,