#include "libsigrok-internal.h"
#include "protocol.h"
+#define UNI_T_UT_D04_NEW "1a86.e008"
+
+static const int hwopts[] = {
+ SR_HWOPT_CONN,
+ 0,
+};
+
static const int hwcaps[] = {
SR_HWCAP_MULTIMETER,
SR_HWCAP_LIMIT_SAMPLES,
0,
};
-static const char *probe_names[] = {
- "Probe",
- NULL,
-};
-
SR_PRIV struct sr_dev_driver uni_t_ut61d_driver_info;
SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info;
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)))) {
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;
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_hwopt *opt;
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) {
+ opt = l->data;
+ switch (opt->hwopt) {
+ case SR_HWOPT_CONN:
+ conn = opt->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;
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);
}
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)
{
clear_instances();
- // libusb_exit(NULL);
-
return SR_OK;
}
sr_spew("Backend requested info_id %d.", info_id);
switch (info_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;
return SR_ERR_ARG;
break;
default:
- sr_err("%s: Unknown info_id %d.", __func__, info_id);
return SR_ERR_ARG;
break;
}
{
struct sr_datafeed_packet packet;
struct sr_datafeed_header header;
- struct sr_datafeed_meta_analog meta;
struct dev_context *devc;
devc = sdi->priv;
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);