X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Ffx2lafw%2Fapi.c;h=6b7f9fa0f0f76e1d46a3103d28013ecaf21cb7e0;hb=2db959063b073b87cfb45a433f2a422b594731b0;hp=7f35ea81574fe2909d6350dcb98f6ec535f45761;hpb=91aea754aaed0f0f2a6fc4b2b875f0d0b7c01f8e;p=libsigrok.git diff --git a/hardware/fx2lafw/api.c b/hardware/fx2lafw/api.c index 7f35ea81..6b7f9fa0 100644 --- a/hardware/fx2lafw/api.c +++ b/hardware/fx2lafw/api.c @@ -28,21 +28,21 @@ static const struct fx2lafw_profile supported_fx2[] = { */ { 0x08a9, 0x0014, "CWAV", "USBee AX", NULL, FIRMWARE_DIR "/fx2lafw-cwav-usbeeax.fw", - 0 }, + 0, NULL, NULL}, /* * CWAV USBee DX * XZL-Studio DX */ { 0x08a9, 0x0015, "CWAV", "USBee DX", NULL, FIRMWARE_DIR "/fx2lafw-cwav-usbeedx.fw", - DEV_CAPS_16BIT }, + DEV_CAPS_16BIT, NULL, NULL }, /* * CWAV USBee SX */ { 0x08a9, 0x0009, "CWAV", "USBee SX", NULL, FIRMWARE_DIR "/fx2lafw-cwav-usbeesx.fw", - 0 }, + 0, NULL, NULL}, /* * Saleae Logic @@ -52,7 +52,7 @@ static const struct fx2lafw_profile supported_fx2[] = { */ { 0x0925, 0x3881, "Saleae", "Logic", NULL, FIRMWARE_DIR "/fx2lafw-saleae-logic.fw", - 0 }, + 0, NULL, NULL}, /* * Default Cypress FX2 without EEPROM, e.g.: @@ -61,16 +61,16 @@ static const struct fx2lafw_profile supported_fx2[] = { */ { 0x04B4, 0x8613, "Cypress", "FX2", NULL, FIRMWARE_DIR "/fx2lafw-cypress-fx2.fw", - DEV_CAPS_16BIT }, + DEV_CAPS_16BIT, NULL, NULL }, /* * Braintechnology USB-LPS */ { 0x16d0, 0x0498, "Braintechnology", "USB-LPS", NULL, FIRMWARE_DIR "/fx2lafw-braintechnology-usb-lps.fw", - DEV_CAPS_16BIT }, + DEV_CAPS_16BIT, NULL, NULL }, - { 0, 0, 0, 0, 0, 0, 0 } + { 0, 0, 0, 0, 0, 0, 0, 0, 0 } }; static const int32_t hwopts[] = { @@ -87,7 +87,7 @@ static const int32_t hwcaps[] = { SR_CONF_CONTINUOUS, }; -static const char *probe_names[] = { +static const char *channel_names[] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", NULL, @@ -126,14 +126,16 @@ static GSList *scan(GSList *options) struct dev_context *devc; struct sr_dev_inst *sdi; struct sr_usb_dev_inst *usb; - struct sr_channel *probe; + struct sr_channel *ch; 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; + struct libusb_device_handle *hdl; + int devcnt, num_logic_channels, ret, i, j; const char *conn; + char manufacturer[64], product[64]; drvc = di->priv; @@ -175,11 +177,41 @@ static GSList *scan(GSList *options) continue; } + if ((ret = libusb_open(devlist[i], &hdl)) < 0) + continue; + + if (des.iManufacturer == 0) { + manufacturer[0] = '\0'; + } else if ((ret = libusb_get_string_descriptor_ascii(hdl, + des.iManufacturer, (unsigned char *) manufacturer, + sizeof(manufacturer))) < 0) { + sr_warn("Failed to get manufacturer string descriptor: %s.", + libusb_error_name(ret)); + continue; + } + + if (des.iProduct == 0) { + product[0] = '\0'; + } else if ((ret = libusb_get_string_descriptor_ascii(hdl, + des.iProduct, (unsigned char *) product, + sizeof(product))) < 0) { + sr_warn("Failed to get product string descriptor: %s.", + libusb_error_name(ret)); + continue; + } + + libusb_close(hdl); + prof = NULL; for (j = 0; supported_fx2[j].vid; j++) { if (des.idVendor == supported_fx2[j].vid && - des.idProduct == supported_fx2[j].pid) { + des.idProduct == supported_fx2[j].pid && + (!supported_fx2[j].usb_manufacturer || + !strcmp(manufacturer, supported_fx2[j].usb_manufacturer)) && + (!supported_fx2[j].usb_manufacturer || + !strcmp(product, supported_fx2[j].usb_product))) { prof = &supported_fx2[j]; + break; } } @@ -194,13 +226,13 @@ static GSList *scan(GSList *options) return NULL; sdi->driver = di; - /* Fill in probelist according to this device's profile. */ - num_logic_probes = prof->dev_caps & DEV_CAPS_16BIT ? 16 : 8; - for (j = 0; j < num_logic_probes; j++) { - if (!(probe = sr_probe_new(j, SR_PROBE_LOGIC, TRUE, - probe_names[j]))) + /* Fill in channellist according to this device's profile. */ + num_logic_channels = prof->dev_caps & DEV_CAPS_16BIT ? 16 : 8; + for (j = 0; j < num_logic_channels; j++) { + if (!(ch = sr_channel_new(j, SR_CHANNEL_LOGIC, TRUE, + channel_names[j]))) return NULL; - sdi->probes = g_slist_append(sdi->probes, probe); + sdi->channels = g_slist_append(sdi->channels, ch); } devc = fx2lafw_dev_new(); @@ -355,9 +387,14 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, (void)cg; + if (!sdi) + return SR_ERR_ARG; + + devc = sdi->priv; + switch (id) { case SR_CONF_CONN: - if (!sdi || !sdi->conn) + if (!sdi->conn) return SR_ERR_ARG; usb = sdi->conn; if (usb->address == 255) @@ -367,10 +404,10 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, snprintf(str, 128, "%d.%d", usb->bus, usb->address); *data = g_variant_new_string(str); break; + case SR_CONF_LIMIT_SAMPLES: + *data = g_variant_new_uint64(devc->limit_samples); + break; case SR_CONF_SAMPLERATE: - if (!sdi) - return SR_ERR; - devc = sdi->priv; *data = g_variant_new_uint64(devc->cur_samplerate); break; default: @@ -388,19 +425,26 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, (void)cg; + if (!sdi) + return SR_ERR_ARG; + if (sdi->status != SR_ST_ACTIVE) return SR_ERR; devc = sdi->priv; - if (id == SR_CONF_SAMPLERATE) { - devc->cur_samplerate = g_variant_get_uint64(data); - ret = SR_OK; - } else if (id == SR_CONF_LIMIT_SAMPLES) { - devc->limit_samples = g_variant_get_uint64(data); - ret = SR_OK; - } else { - ret = SR_ERR_NA; + ret = SR_OK; + + switch (id) + { + case SR_CONF_SAMPLERATE: + devc->cur_samplerate = g_variant_get_uint64(data); + break; + case SR_CONF_LIMIT_SAMPLES: + devc->limit_samples = g_variant_get_uint64(data); + break; + default: + ret = SR_ERR_NA; } return ret; @@ -477,13 +521,14 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) usb = sdi->conn; /* Configures devc->trigger_* and devc->sample_wide */ - if (fx2lafw_configure_probes(sdi) != SR_OK) { - sr_err("Failed to configure probes."); + if (fx2lafw_configure_channels(sdi) != SR_OK) { + sr_err("Failed to configure channels."); return SR_ERR; } devc->cb_data = cb_data; - devc->num_samples = 0; + devc->sent_samples = 0; + devc->acq_aborted = FALSE; devc->empty_transfer_count = 0; timeout = fx2lafw_get_timeout(devc); @@ -526,8 +571,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) /* Send header packet to the session bus. */ std_session_send_df_header(cb_data, LOG_PREFIX); - if ((ret = fx2lafw_command_start_acquisition(usb->devhdl, - devc->cur_samplerate, devc->sample_wide)) != SR_OK) { + if ((ret = fx2lafw_command_start_acquisition(sdi)) != SR_OK) { fx2lafw_abort_acquisition(devc); return ret; }