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 struct sr_dev_driver *di_ut61d = &uni_t_ut61d_driver_info;
+static struct sr_dev_driver *di_vc820 = &voltcraft_vc820_driver_info;
-SR_PRIV struct sr_dev_driver uni_t_dmm_driver_info;
-static struct sr_dev_driver *di = &uni_t_dmm_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)
+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 *devices, *l;
struct sr_dev_inst *sdi;
- struct drv_context *drvc;
struct dev_context *devc;
+ struct drv_context *drvc;
struct sr_probe *probe;
- libusb_device **devlist;
- struct libusb_device_descriptor des;
- GSList *devices;
- int vid, pid, devcnt, err, i;
-
- (void)conn;
+ struct libusb_device *ldev;
+ int i, devcnt;
- /* 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;
-
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 (!(l = sr_usb_find(drvc->sr_ctx->libusb_ctx, "1a86.e008")))
+ return NULL;
+
+ for (i = 0; i < (int)g_slist_length(l); i++) {
+ ldev = (struct libusb_device *)l->data;
if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) {
sr_err("Device context malloc failed.");
devcnt = g_slist_length(drvc->instances);
if (!(sdi = sr_dev_inst_new(devcnt, SR_ST_INACTIVE,
- "UNI-T DMM", NULL, NULL))) {
+ 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;
-}
-
-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;
+ libusb_get_bus_number(ldev),
+ libusb_get_device_address(ldev), NULL);
drvc->instances = g_slist_append(drvc->instances, l->data);
+ devices = g_slist_append(devices, sdi);
}
return devices;
static int hw_dev_open(struct sr_dev_inst *sdi)
{
- return open_usb(sdi);
+ struct dev_context *devc;
+
+ devc = sdi->priv;
+
+ return sr_usb_open(NULL, devc->usb);
}
static int hw_dev_close(struct sr_dev_inst *sdi)
{
clear_instances();
- // libusb_exit(NULL);
-
return SR_OK;
}
*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;
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;
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,
+ .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,
+};
+
+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,