/*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
*
* Copyright (C) 2012 Uwe Hermann <uwe@hermann-uwe.de>
*
#include "libsigrok-internal.h"
#include "protocol.h"
-/* Note: The order here must match the DMM/device enum in protocol.h. */
-static const char *dev_names[] = {
- "UNI-T UT61D",
- "Voltcraft VC-820",
-};
+#define UNI_T_UT_D04_NEW "1a86.e008"
-static const int hwcaps[] = {
- SR_HWCAP_MULTIMETER,
- SR_HWCAP_LIMIT_SAMPLES,
- SR_HWCAP_LIMIT_MSEC,
- SR_HWCAP_CONTINUOUS,
- 0,
+static const int32_t hwopts[] = {
+ SR_CONF_CONN,
};
-static const char *probe_names[] = {
- "Probe",
- NULL,
+static const int32_t hwcaps[] = {
+ SR_CONF_MULTIMETER,
+ SR_CONF_LIMIT_SAMPLES,
+ SR_CONF_LIMIT_MSEC,
+ SR_CONF_CONTINUOUS,
};
SR_PRIV struct sr_dev_driver uni_t_ut61d_driver_info;
-static struct sr_dev_driver *di_ut61d = &uni_t_ut61d_driver_info;
-
SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info;
-static struct sr_dev_driver *di_vc820 = &voltcraft_vc820_driver_info;
-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. */
+static struct sr_dev_driver *di_ut61d = &uni_t_ut61d_driver_info;
+static struct sr_dev_driver *di_vc820 = &voltcraft_vc820_driver_info;
- devc = sdi->priv;
+/* After hw_init() this will point to a device-specific entry (see above). */
+static struct sr_dev_driver *di = NULL;
- if ((cnt = libusb_get_device_list(NULL, &devlist)) < 0) {
- sr_err("Error getting USB device list: %d.", cnt);
- return SR_ERR;
- }
+static int clear_instances(void)
+{
+ /* TODO: Use common code later. */
- 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;
- }
+ return SR_OK;
+}
- if (libusb_get_bus_number(devlist[i]) != devc->usb->bus
- || libusb_get_device_address(devlist[i]) != devc->usb->address)
- continue;
+static int hw_init(struct sr_context *sr_ctx, int dmm)
+{
+ if (dmm == UNI_T_UT61D)
+ di = di_ut61d;
+ else if (dmm == VOLTCRAFT_VC820)
+ di = di_vc820;
+ sr_dbg("Selected '%s' subdriver.", di->name);
- if ((tmp = libusb_open(devlist[i], &devc->usb->devhdl))) {
- sr_err("Failed to open device: %d.", tmp);
- break;
- }
+ return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN);
+}
- 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, int dmm)
+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;
+ const char *conn;
- (void)conn;
+ (void)options;
- /* TODO: Use common code later, refactor. */
+ drvc = di->priv;
- if (dmm == UNI_T_UT61D)
- drvc = di_ut61d->priv;
- else if (dmm == VOLTCRAFT_VC820)
- drvc = di_vc820->priv;
+ /* USB scan is always authoritative. */
+ clear_instances();
- /* Hardcoded for now. */
- vid = UT_D04_CABLE_USB_VID;
- pid = UT_D04_CABLE_USB_DID;
+ conn = NULL;
+ for (l = options; l; l = l->next) {
+ src = l->data;
+ switch (src->key) {
+ case SR_CONF_CONN:
+ conn = g_variant_get_string(src->data, NULL);
+ 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,
- dev_names[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(int dmm)
-{
- 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;
- }
-
- if (dmm == UNI_T_UT61D)
- di_ut61d->priv = drvc;
- else if (dmm == VOLTCRAFT_VC820)
- di_vc820->priv = drvc;
-
- return SR_OK;
-}
-
-static int hw_init_ut61d(void)
-{
- return hw_init(UNI_T_UT61D);
-}
-
-static int hw_init_vc820(void)
-{
- return hw_init(VOLTCRAFT_VC820);
-}
+ devc->usb = usb;
-static GSList *hw_scan(GSList *options, int dmm)
-{
- GSList *l, *devices;
- struct sr_dev_inst *sdi;
- struct drv_context *drvc;
-
- (void)options;
-
- if (dmm == UNI_T_UT61D)
- drvc = di_ut61d->priv;
- else if (dmm == VOLTCRAFT_VC820)
- drvc = di_vc820->priv;
-
- if (!(devices = connect_usb(NULL, dmm)))
- return NULL;
-
- for (l = devices; l; l = l->next) {
- sdi = l->data;
-
- if (dmm == UNI_T_UT61D)
- sdi->driver = di_ut61d;
- else if (dmm == VOLTCRAFT_VC820)
- sdi->driver = di_vc820;
-
- 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;
}
-static GSList *hw_scan_ut61d(GSList *options)
+static GSList *hw_dev_list(void)
{
- return hw_scan(options, UNI_T_UT61D);
+ return ((struct drv_context *)(di->priv))->instances;
}
-static GSList *hw_scan_vc820(GSList *options)
-{
- return hw_scan(options, VOLTCRAFT_VC820);
-}
-
-static GSList *hw_dev_list(int dmm)
+static int hw_dev_open(struct sr_dev_inst *sdi)
{
struct drv_context *drvc;
+ struct dev_context *devc;
- if (dmm == UNI_T_UT61D)
- drvc = di_ut61d->priv;
- else if (dmm == VOLTCRAFT_VC820)
- drvc = di_vc820->priv;
-
- return drvc->instances;
-}
-
-static GSList *hw_dev_list_ut61d(void)
-{
- return hw_dev_list(UNI_T_UT61D);
-}
-
-static GSList *hw_dev_list_vc820(void)
-{
- return hw_dev_list(VOLTCRAFT_VC820);
-}
+ drvc = di->priv;
+ devc = sdi->priv;
-static int hw_dev_open(struct sr_dev_inst *sdi)
-{
- return open_usb(sdi);
+ 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;
}
-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, GVariant *data, 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) {
+ if (g_variant_get_uint64(data) == 0) {
sr_err("Time limit cannot be 0.");
return SR_ERR;
}
- devc->limit_msec = *(const uint64_t *)value;
+ devc->limit_msec = g_variant_get_uint64(data);
sr_dbg("Setting time limit to %" PRIu64 "ms.",
devc->limit_msec);
break;
- case SR_HWCAP_LIMIT_SAMPLES:
- if (*(const uint64_t *)value == 0) {
+ case SR_CONF_LIMIT_SAMPLES:
+ if (g_variant_get_uint64(data) == 0) {
sr_err("Sample limit cannot be 0.");
return SR_ERR;
}
- devc->limit_samples = *(const uint64_t *)value;
+ devc->limit_samples = g_variant_get_uint64(data);
sr_dbg("Setting sample limit to %" PRIu64 ".",
devc->limit_samples);
break;
default:
- sr_err("Unknown capability: %d.", hwcap);
- return SR_ERR;
+ return SR_ERR_NA;
+ }
+
+ return SR_OK;
+}
+
+static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi)
+{
+
+ (void)sdi;
+
+ switch (key) {
+ case SR_CONF_SCAN_OPTIONS:
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+ hwopts, ARRAY_SIZE(hwopts), sizeof(int32_t));
+ break;
+ case SR_CONF_DEVICE_OPTIONS:
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+ hwcaps, ARRAY_SIZE(hwcaps), sizeof(int32_t));
break;
+ default:
+ return SR_ERR_NA;
}
return SR_OK;
}
static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
- int dmm, void *cb_data)
+ 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;
- sr_dbg("Starting acquisition.");
-
devc->cb_data = cb_data;
/* Send header packet to the session bus. */
- sr_dbg("Sending SR_DF_HEADER.");
- packet.type = SR_DF_HEADER;
- packet.payload = (uint8_t *)&header;
- header.feed_version = 1;
- 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 (dmm == UNI_T_UT61D) {
+ std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
+
+ if (!strcmp(di->name, "uni-t-ut61d")) {
sr_source_add(0, 0, 10 /* poll_timeout */,
uni_t_ut61d_receive_data, (void *)sdi);
- } else if (dmm == VOLTCRAFT_VC820) {
+ } 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_start_ut61d(const struct sr_dev_inst *sdi,
- void *cb_data)
-{
- return hw_dev_acquisition_start(sdi, UNI_T_UT61D, cb_data);
-}
-
-static int hw_dev_acquisition_start_vc820(const struct sr_dev_inst *sdi,
- void *cb_data)
-{
- return hw_dev_acquisition_start(sdi, VOLTCRAFT_VC820, cb_data);
-}
-
-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;
.api_version = 1,
.init = hw_init_ut61d,
.cleanup = hw_cleanup,
- .scan = hw_scan_ut61d,
- .dev_list = hw_dev_list_ut61d,
+ .scan = hw_scan,
+ .dev_list = hw_dev_list,
.dev_clear = clear_instances,
+ .config_get = NULL,
+ .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_ut61d,
+ .dev_acquisition_start = hw_dev_acquisition_start,
.dev_acquisition_stop = hw_dev_acquisition_stop,
.priv = NULL,
};
.api_version = 1,
.init = hw_init_vc820,
.cleanup = hw_cleanup,
- .scan = hw_scan_vc820,
- .dev_list = hw_dev_list_vc820,
+ .scan = hw_scan,
+ .dev_list = hw_dev_list,
.dev_clear = clear_instances,
+ .config_get = NULL,
+ .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_vc820,
+ .dev_acquisition_start = hw_dev_acquisition_start,
.dev_acquisition_stop = hw_dev_acquisition_stop,
.priv = NULL,
};
projects / libsigrok.git / blobdiff