#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_HWOPT_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;
/* After hw_init() this will point to a device-specific entry (see above). */
static struct sr_dev_driver *di = NULL;
-static int open_usb(struct sr_dev_inst *sdi)
-{
- libusb_device **devlist;
- struct libusb_device_descriptor des;
- struct dev_context *devc;
- int ret, tmp, cnt, i;
-
- /* TODO: Use common code later, refactor. */
-
- devc = sdi->priv;
-
- if ((cnt = libusb_get_device_list(NULL, &devlist)) < 0) {
- sr_err("Error getting USB device list: %d.", cnt);
- return SR_ERR;
- }
-
- 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 (libusb_get_bus_number(devlist[i]) != devc->usb->bus
- || libusb_get_device_address(devlist[i]) != devc->usb->address)
- continue;
-
- if ((tmp = libusb_open(devlist[i], &devc->usb->devhdl))) {
- sr_err("Failed to open device: %d.", tmp);
- break;
- }
-
- sr_info("Opened USB device on %d.%d.",
- devc->usb->bus, devc->usb->address);
- ret = SR_OK;
- break;
- }
- libusb_free_device_list(devlist, 1);
-
- return ret;
-}
-
-static GSList *connect_usb(const char *conn)
-{
- struct sr_dev_inst *sdi;
- struct drv_context *drvc;
- struct dev_context *devc;
- struct sr_probe *probe;
- libusb_device **devlist;
- struct libusb_device_descriptor des;
- GSList *devices;
- int vid, pid, devcnt, err, i;
-
- (void)conn;
-
- /* TODO: Use common code later, refactor. */
-
- drvc = di->priv;
-
- /* Hardcoded for now. */
- vid = UT_D04_CABLE_USB_VID;
- pid = UT_D04_CABLE_USB_DID;
-
- 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 (des.idVendor != vid || des.idProduct != pid)
- continue;
-
- 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,
- di->longname, NULL, NULL))) {
- sr_err("sr_dev_inst_new returned NULL.");
- return NULL;
- }
- sdi->priv = devc;
- 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(int dmm)
+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 int hw_init_ut61d(void)
+static int hw_init_ut61d(struct sr_context *sr_ctx)
{
- return hw_init(UNI_T_UT61D);
+ return hw_init(sr_ctx, UNI_T_UT61D);
}
-static int hw_init_vc820(void)
+static int hw_init_vc820(struct sr_context *sr_ctx)
{
- return hw_init(VOLTCRAFT_VC820);
+ return hw_init(sr_ctx, VOLTCRAFT_VC820);
}
static GSList *hw_scan(GSList *options)
{
- GSList *l, *devices;
+ 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;
+ const char *conn;
(void)options;
drvc = di->priv;
- if (!(devices = connect_usb(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;
+
+ 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 (l = usb_devices; l; l = l->next) {
+ usb = l->data;
- for (l = devices; l; l = l->next) {
- sdi = l->data;
+ if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
+ sr_err("Device context malloc failed.");
+ return 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;
- drvc->instances = g_slist_append(drvc->instances, l->data);
+ if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
+ return NULL;
+ sdi->probes = g_slist_append(sdi->probes, probe);
+
+ devc->usb = usb;
+
+ drvc->instances = g_slist_append(drvc->instances, sdi);
+ devices = g_slist_append(devices, sdi);
}
return devices;
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)
{
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;
}
devc = sdi->priv;
switch (hwcap) {
- case SR_HWCAP_LIMIT_MSEC:
+ case SR_CONF_LIMIT_MSEC:
/* TODO: Not yet implemented. */
if (*(const uint64_t *)value == 0) {
sr_err("Time limit cannot be 0.");
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;
{
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);
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;
projects / libsigrok.git / blobdiff