/*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
*
* Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
* Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
{ 0, 0, 0, 0, 0, 0, 0 }
};
+static const int32_t hwopts[] = {
+ SR_CONF_CONN,
+};
+
static const int32_t hwcaps[] = {
SR_CONF_LOGIC_ANALYZER,
SR_CONF_TRIGGER_TYPE,
static int fx2lafw_dev_open(struct sr_dev_inst *sdi)
{
libusb_device **devlist;
+ struct sr_usb_dev_inst *usb;
struct libusb_device_descriptor des;
struct dev_context *devc;
struct drv_context *drvc;
drvc = di->priv;
devc = sdi->priv;
+ usb = sdi->conn;
if (sdi->status == SR_ST_ACTIVE)
/* Device is already in use. */
* This device is fully enumerated, so we need to find
* this device by vendor, product, bus and address.
*/
- if (libusb_get_bus_number(devlist[i]) != devc->usb->bus
- || libusb_get_device_address(devlist[i]) != devc->usb->address)
+ if (libusb_get_bus_number(devlist[i]) != usb->bus
+ || libusb_get_device_address(devlist[i]) != usb->address)
/* This is not the one. */
continue;
}
- if (!(ret = libusb_open(devlist[i], &devc->usb->devhdl))) {
- if (devc->usb->address == 0xff)
+ if (!(ret = libusb_open(devlist[i], &usb->devhdl))) {
+ if (usb->address == 0xff)
/*
* First time we touch this device after FW
* upload, so we don't know the address yet.
*/
- devc->usb->address = libusb_get_device_address(devlist[i]);
+ usb->address = libusb_get_device_address(devlist[i]);
} else {
sr_err("Failed to open device: %s.",
libusb_error_name(ret));
break;
}
- ret = command_get_fw_version(devc->usb->devhdl, &vi);
+ ret = command_get_fw_version(usb->devhdl, &vi);
if (ret != SR_OK) {
sr_err("Failed to get firmware version.");
break;
}
- ret = command_get_revid_version(devc->usb->devhdl, &revid);
+ ret = command_get_revid_version(usb->devhdl, &revid);
if (ret != SR_OK) {
sr_err("Failed to get REVID.");
break;
sdi->status = SR_ST_ACTIVE;
sr_info("Opened device %d on %d.%d, "
"interface %d, firmware %d.%d.",
- sdi->index, devc->usb->bus, devc->usb->address,
+ sdi->index, usb->bus, usb->address,
USB_INTERFACE, vi.major, vi.minor);
sr_info("Detected REVID=%d, it's a Cypress CY7C68013%s.",
static int clear_instances(void)
{
- GSList *l;
- struct sr_dev_inst *sdi;
- struct drv_context *drvc;
- struct dev_context *devc;
- int ret;
-
- drvc = di->priv;
- ret = SR_OK;
- for (l = drvc->instances; l; l = l->next) {
- if (!(sdi = l->data)) {
- /* Log error, but continue cleaning up the rest. */
- sr_err("sdi was NULL, continuing.");
- ret = SR_ERR_BUG;
- continue;
- }
- if (!(devc = sdi->priv)) {
- /* Log error, but continue cleaning up the rest. */
- sr_err("sdi->priv was NULL, continuing.");
- ret = SR_ERR_BUG;
- continue;
- }
- hw_dev_close(sdi);
- sr_usb_dev_inst_free(devc->usb);
- sdi = l->data;
- sr_dev_inst_free(sdi);
- }
-
- g_slist_free(drvc->instances);
- drvc->instances = NULL;
-
- return ret;
+ return std_dev_clear(di, NULL);
}
static int hw_init(struct sr_context *sr_ctx)
static GSList *hw_scan(GSList *options)
{
- GSList *devices;
- struct libusb_device_descriptor des;
- struct sr_dev_inst *sdi;
- const struct fx2lafw_profile *prof;
struct drv_context *drvc;
struct dev_context *devc;
+ struct sr_dev_inst *sdi;
+ struct sr_usb_dev_inst *usb;
struct sr_probe *probe;
+ struct sr_config *src;
+ const struct fx2lafw_profile *prof;
+ GSList *l, *devices, *conn_devices;
+ struct libusb_device_descriptor des;
libusb_device **devlist;
int devcnt, num_logic_probes, ret, i, j;
-
- (void)options;
+ const char *conn;
drvc = di->priv;
- /* This scan always invalidates any previous scans. */
- clear_instances();
+ 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_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, conn);
+ else
+ conn_devices = NULL;
/* Find all fx2lafw compatible devices and upload firmware to them. */
devices = NULL;
libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
for (i = 0; devlist[i]; i++) {
+ if (conn) {
+ usb = NULL;
+ for (l = conn_devices; l; l = l->next) {
+ usb = l->data;
+ if (usb->bus == libusb_get_bus_number(devlist[i])
+ && usb->address == libusb_get_device_address(devlist[i]))
+ break;
+ }
+ if (!l)
+ /* This device matched none of the ones that
+ * matched the conn specification. */
+ continue;
+ }
- if ((ret = libusb_get_device_descriptor(
- devlist[i], &des)) != 0) {
+ if ((ret = libusb_get_device_descriptor( devlist[i], &des)) != 0) {
sr_warn("Failed to get device descriptor: %s.",
libusb_error_name(ret));
continue;
/* Already has the firmware, so fix the new address. */
sr_dbg("Found an fx2lafw device.");
sdi->status = SR_ST_INACTIVE;
- devc->usb = sr_usb_dev_inst_new
- (libusb_get_bus_number(devlist[i]),
- libusb_get_device_address(devlist[i]), NULL);
+ sdi->inst_type = SR_INST_USB;
+ sdi->conn = sr_usb_dev_inst_new(libusb_get_bus_number(devlist[i]),
+ libusb_get_device_address(devlist[i]), NULL);
} else {
if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION,
prof->firmware) == SR_OK)
else
sr_err("Firmware upload failed for "
"device %d.", devcnt);
- devc->usb = sr_usb_dev_inst_new
- (libusb_get_bus_number(devlist[i]), 0xff, NULL);
+ sdi->inst_type = SR_INST_USB;
+ sdi->conn = sr_usb_dev_inst_new (libusb_get_bus_number(devlist[i]),
+ 0xff, NULL);
}
}
libusb_free_device_list(devlist, 1);
static int hw_dev_open(struct sr_dev_inst *sdi)
{
+ struct sr_usb_dev_inst *usb;
struct dev_context *devc;
int ret;
int64_t timediff_us, timediff_ms;
devc = sdi->priv;
+ usb = sdi->conn;
/*
* If the firmware was recently uploaded, wait up to MAX_RENUM_DELAY_MS
return SR_ERR;
}
- devc = sdi->priv;
-
- ret = libusb_claim_interface(devc->usb->devhdl, USB_INTERFACE);
+ ret = libusb_claim_interface(usb->devhdl, USB_INTERFACE);
if (ret != 0) {
switch(ret) {
case LIBUSB_ERROR_BUSY:
static int hw_dev_close(struct sr_dev_inst *sdi)
{
- struct dev_context *devc;
+ struct sr_usb_dev_inst *usb;
- devc = sdi->priv;
-
- if (devc->usb->devhdl == NULL)
+ usb = sdi->conn;
+ if (usb->devhdl == NULL)
return SR_ERR;
- sr_info("Closing device %d on %d.%d, interface %d.",
- sdi->index, devc->usb->bus, devc->usb->address, USB_INTERFACE);
- libusb_release_interface(devc->usb->devhdl, USB_INTERFACE);
- libusb_close(devc->usb->devhdl);
- devc->usb->devhdl = NULL;
+ sr_info("fx2lafw: Closing device %d on %d.%d interface %d.",
+ sdi->index, usb->bus, usb->address, USB_INTERFACE);
+ libusb_release_interface(usb->devhdl, USB_INTERFACE);
+ libusb_close(usb->devhdl);
+ usb->devhdl = NULL;
sdi->status = SR_ST_INACTIVE;
return SR_OK;
static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
+ struct sr_usb_dev_inst *usb;
+ char str[128];
switch (id) {
+ case SR_CONF_CONN:
+ if (!sdi || !sdi->conn)
+ return SR_ERR_ARG;
+ usb = sdi->conn;
+ if (usb->address == 255)
+ /* Device still needs to re-enumerate after firmware
+ * upload, so we don't know its (future) address. */
+ return SR_ERR;
+ snprintf(str, 128, "%d.%d", usb->bus, usb->address);
+ *data = g_variant_new_string(str);
+ break;
case SR_CONF_SAMPLERATE:
- if (sdi) {
- devc = sdi->priv;
- *data = g_variant_new_uint64(devc->cur_samplerate);
- } else
+ if (!sdi)
return SR_ERR;
+ devc = sdi->priv;
+ *data = g_variant_new_uint64(devc->cur_samplerate);
break;
default:
- return SR_ERR_ARG;
+ return SR_ERR_NA;
}
return SR_OK;
struct dev_context *devc;
int ret;
+ if (sdi->status != SR_ST_ACTIVE)
+ return SR_ERR;
+
devc = sdi->priv;
if (id == SR_CONF_SAMPLERATE) {
devc->limit_samples = g_variant_get_uint64(data);
ret = SR_OK;
} else {
- ret = SR_ERR;
+ ret = SR_ERR_NA;
}
return ret;
(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));
*data = g_variant_new_string(TRIGGER_TYPE);
break;
default:
- return SR_ERR_ARG;
+ return SR_ERR_NA;
}
return SR_OK;
{
struct dev_context *devc;
struct drv_context *drvc;
+ struct sr_usb_dev_inst *usb;
struct libusb_transfer *transfer;
const struct libusb_pollfd **lupfd;
unsigned int i, timeout, num_transfers;
unsigned char *buf;
size_t size;
+ if (sdi->status != SR_ST_ACTIVE)
+ return SR_ERR_DEV_CLOSED;
+
drvc = di->priv;
devc = sdi->priv;
+ usb = sdi->conn;
if (devc->submitted_transfers != 0)
return SR_ERR;
return SR_ERR_MALLOC;
}
transfer = libusb_alloc_transfer(0);
- libusb_fill_bulk_transfer(transfer, devc->usb->devhdl,
+ libusb_fill_bulk_transfer(transfer, usb->devhdl,
2 | LIBUSB_ENDPOINT_IN, buf, size,
receive_transfer, devc, timeout);
if ((ret = libusb_submit_transfer(transfer)) != 0) {
/* Send header packet to the session bus. */
std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
- if ((ret = command_start_acquisition(devc->usb->devhdl,
+ if ((ret = command_start_acquisition (usb->devhdl,
devc->cur_samplerate, devc->sample_wide)) != SR_OK) {
abort_acquisition(devc);
return ret;
projects / libsigrok.git / blobdiff