X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkingst-la2016%2Fapi.c;h=8f8afef8728f4c1468d6ee798018ccad4994f4cb;hb=6d53e9497892df15e13899465ce4c2962a70a782;hp=34c64beb9830e1d4dc6095472f0fa05d5265f34c;hpb=96dc954e1c17a34daafcccb0a6013873d7ec9ee4;p=libsigrok.git diff --git a/src/hardware/kingst-la2016/api.c b/src/hardware/kingst-la2016/api.c index 34c64beb..8f8afef8 100644 --- a/src/hardware/kingst-la2016/api.c +++ b/src/hardware/kingst-la2016/api.c @@ -45,7 +45,8 @@ static const uint32_t devopts[] = { /* TODO: SR_CONF_CONTINUOUS, */ SR_CONF_CONN | SR_CONF_GET, SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, - SR_CONF_LIMIT_SAMPLES | SR_CONF_SET | SR_CONF_GET | SR_CONF_LIST, + SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, SR_CONF_VOLTAGE_THRESHOLD | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_LOGIC_THRESHOLD | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_LOGIC_THRESHOLD_CUSTOM | SR_CONF_GET | SR_CONF_SET, @@ -60,12 +61,46 @@ static const int32_t trigger_matches[] = { SR_TRIGGER_FALLING, }; -static const char *channel_names[] = { - "0", "1", "2", "3", "4", "5", "6", "7", - "8", "9", "10", "11", "12", "13", "14", "15", +static const char *channel_names_logic[] = { + "CH0", "CH1", "CH2", "CH3", "CH4", "CH5", "CH6", "CH7", + "CH8", "CH9", "CH10", "CH11", "CH12", "CH13", "CH14", "CH15", + "CH16", "CH17", "CH18", "CH19", "CH20", "CH21", "CH22", "CH23", + "CH24", "CH25", "CH26", "CH27", "CH28", "CH29", "CH30", "CH31", }; -static const uint64_t samplerates_la2016[] = { +/* + * The hardware uses a 100/200/500MHz base clock (model dependent) and + * a 16bit divider (common across all models). The range from 10kHz to + * 100/200/500MHz should be applicable to all devices. High rates may + * suffer from coarse resolution (e.g. in the "500MHz div 2" case) and + * may not provide the desired 1/2/5 steps. Fortunately this exclusively + * affects the 500MHz model where 250MHz is used instead of 200MHz and + * the 166MHz and 125MHz rates are not presented to users. Deep memory + * of these models and hardware compression reduce the necessity to let + * users pick from a huge list of possible rates. + * + */ + +static const uint64_t rates_500mhz[] = { + SR_KHZ(10), + SR_KHZ(20), + SR_KHZ(50), + SR_KHZ(100), + SR_KHZ(200), + SR_KHZ(500), + SR_MHZ(1), + SR_MHZ(2), + SR_MHZ(5), + SR_MHZ(10), + SR_MHZ(20), + SR_MHZ(50), + SR_MHZ(100), + SR_MHZ(250), + SR_MHZ(500), +}; + +static const uint64_t rates_200mhz[] = { + SR_KHZ(10), SR_KHZ(20), SR_KHZ(50), SR_KHZ(100), @@ -73,9 +108,7 @@ static const uint64_t samplerates_la2016[] = { SR_KHZ(500), SR_MHZ(1), SR_MHZ(2), - SR_MHZ(4), SR_MHZ(5), - SR_MHZ(8), SR_MHZ(10), SR_MHZ(20), SR_MHZ(50), @@ -83,7 +116,8 @@ static const uint64_t samplerates_la2016[] = { SR_MHZ(200), }; -static const uint64_t samplerates_la1016[] = { +static const uint64_t rates_100mhz[] = { + SR_KHZ(10), SR_KHZ(20), SR_KHZ(50), SR_KHZ(100), @@ -91,9 +125,7 @@ static const uint64_t samplerates_la1016[] = { SR_KHZ(500), SR_MHZ(1), SR_MHZ(2), - SR_MHZ(4), SR_MHZ(5), - SR_MHZ(8), SR_MHZ(10), SR_MHZ(20), SR_MHZ(50), @@ -125,29 +157,263 @@ static const char *logic_threshold[] = { "USER", }; -#define MAX_NUM_LOGIC_THRESHOLD_ENTRIES ARRAY_SIZE(logic_threshold) +#define LOGIC_THRESHOLD_IDX_USER (ARRAY_SIZE(logic_threshold) - 1) + +/* Convenience. Release an allocated devc from error paths. */ +static void kingst_la2016_free_devc(struct dev_context *devc) +{ + if (!devc) + return; + g_free(devc->mcu_firmware); + g_free(devc->fpga_bitstream); + g_free(devc); +} + +/* Convenience. Release an allocated sdi from error paths. */ +static void kingst_la2016_free_sdi(struct sr_dev_inst *sdi) +{ + if (!sdi) + return; + g_free(sdi->vendor); + g_free(sdi->model); + g_free(sdi->version); + g_free(sdi->serial_num); + g_free(sdi->connection_id); + sr_usb_dev_inst_free(sdi->conn); + kingst_la2016_free_devc(sdi->priv); +} + +/* Convenience. Open a USB device (including claiming an interface). */ +static int la2016_open_usb(struct sr_usb_dev_inst *usb, + libusb_device *dev, gboolean show_message) +{ + int ret; + + ret = libusb_open(dev, &usb->devhdl); + if (ret != 0) { + if (show_message) { + sr_err("Cannot open device: %s.", + libusb_error_name(ret)); + } + return SR_ERR_IO; + } + + if (usb->address == 0xff) { + /* + * First encounter after firmware upload. + * Grab current address after enumeration. + */ + usb->address = libusb_get_device_address(dev); + } + + ret = libusb_claim_interface(usb->devhdl, USB_INTERFACE); + if (ret == LIBUSB_ERROR_BUSY) { + sr_err("Cannot claim USB interface. Another program or driver using it?"); + return SR_ERR_IO; + } else if (ret == LIBUSB_ERROR_NO_DEVICE) { + sr_err("Device has been disconnected."); + return SR_ERR_IO; + } else if (ret != 0) { + sr_err("Cannot claim USB interface: %s.", + libusb_error_name(ret)); + return SR_ERR_IO; + } + + return SR_OK; +} + +/* Convenience. Close an opened USB device (and release the interface). */ +static void la2016_close_usb(struct sr_usb_dev_inst *usb) +{ + + if (!usb) + return; + + if (usb->devhdl) { + libusb_release_interface(usb->devhdl, USB_INTERFACE); + libusb_close(usb->devhdl); + usb->devhdl = NULL; + } +} + +/* Communicate to an USB device to identify the Kingst LA model. */ +static int la2016_identify_read(struct sr_dev_inst *sdi, + struct sr_usb_dev_inst *usb, libusb_device *dev, + gboolean show_message) +{ + int ret; + + ret = la2016_open_usb(usb, dev, show_message); + if (ret != SR_OK) { + if (show_message) + sr_err("Cannot communicate to MCU firmware."); + return ret; + } + + /* + * Also complete the hardware configuration (FPGA bitstream) + * when MCU firmware communication became operational. Either + * failure is considered fatal when probing for the device. + */ + ret = la2016_identify_device(sdi, show_message); + if (ret == SR_OK) { + ret = la2016_init_hardware(sdi); + } + + la2016_close_usb(usb); + + return ret; +} + +/* Find given conn_id in another USB enum. Identify Kingst LA model. */ +static int la2016_identify_enum(struct sr_dev_inst *sdi) +{ + struct sr_dev_driver *di; + struct drv_context *drvc; + struct sr_context *ctx; + libusb_device **devlist, *dev; + struct libusb_device_descriptor des; + int ret, id_ret; + size_t device_count, dev_idx; + char conn_id[64]; + + di = sdi->driver; + drvc = di->context; + ctx = drvc->sr_ctx;; + + ret = libusb_get_device_list(ctx->libusb_ctx, &devlist); + if (ret < 0) + return SR_ERR_IO; + device_count = ret; + if (!device_count) + return SR_ERR_IO; + id_ret = SR_ERR_IO; + for (dev_idx = 0; dev_idx < device_count; dev_idx++) { + dev = devlist[dev_idx]; + libusb_get_device_descriptor(dev, &des); + if (des.idVendor != LA2016_VID || des.idProduct != LA2016_PID) + continue; + if (des.iProduct != LA2016_IPRODUCT_INDEX) + continue; + ret = usb_get_port_path(dev, conn_id, sizeof(conn_id)); + if (ret < 0) + continue; + if (strcmp(sdi->connection_id, conn_id) != 0) + continue; + id_ret = la2016_identify_read(sdi, sdi->conn, dev, FALSE); + break; + } + libusb_free_device_list(devlist, 1); + + return id_ret; +} + +/* Wait for a device to re-appear after firmware upload. */ +static int la2016_identify_wait(struct sr_dev_inst *sdi) +{ + struct dev_context *devc; + uint64_t reset_done, now, elapsed_ms; + int ret; + + devc = sdi->priv; + + sr_info("Waiting for device to reset after firmware upload."); + now = g_get_monotonic_time(); + reset_done = devc->fw_uploaded + RENUM_GONE_DELAY_MS * 1000; + if (now < reset_done) + g_usleep(reset_done - now); + do { + now = g_get_monotonic_time(); + elapsed_ms = (now - devc->fw_uploaded) / 1000; + sr_spew("Waited %" PRIu64 "ms.", elapsed_ms); + ret = la2016_identify_enum(sdi); + if (ret == SR_OK) { + devc->fw_uploaded = 0; + break; + } + g_usleep(RENUM_POLL_INTERVAL_MS * 1000); + } while (elapsed_ms < RENUM_CHECK_PERIOD_MS); + if (ret != SR_OK) { + sr_err("Device failed to re-enumerate."); + return ret; + } + sr_info("Device came back after %" PRIi64 "ms.", elapsed_ms); + + return SR_OK; +} + +/* + * Open given conn_id from another USB enum. Used by dev_open(). Similar + * to, and should be kept in sync with la2016_identify_enum(). + */ +static int la2016_open_enum(struct sr_dev_inst *sdi) +{ + struct sr_dev_driver *di; + struct drv_context *drvc; + struct sr_context *ctx; + libusb_device **devlist, *dev; + struct libusb_device_descriptor des; + int ret, open_ret; + size_t device_count, dev_idx; + char conn_id[64]; + + di = sdi->driver; + drvc = di->context; + ctx = drvc->sr_ctx;; + + ret = libusb_get_device_list(ctx->libusb_ctx, &devlist); + if (ret < 0) + return SR_ERR_IO; + device_count = ret; + if (!device_count) + return SR_ERR_IO; + open_ret = SR_ERR_IO; + for (dev_idx = 0; dev_idx < device_count; dev_idx++) { + dev = devlist[dev_idx]; + libusb_get_device_descriptor(dev, &des); + if (des.idVendor != LA2016_VID || des.idProduct != LA2016_PID) + continue; + if (des.iProduct != LA2016_IPRODUCT_INDEX) + continue; + ret = usb_get_port_path(dev, conn_id, sizeof(conn_id)); + if (ret < 0) + continue; + if (strcmp(sdi->connection_id, conn_id) != 0) + continue; + open_ret = la2016_open_usb(sdi->conn, dev, TRUE); + break; + } + libusb_free_device_list(devlist, 1); + + return open_ret; +} static GSList *scan(struct sr_dev_driver *di, GSList *options) { struct drv_context *drvc; + struct sr_context *ctx; struct dev_context *devc; struct sr_dev_inst *sdi; struct sr_usb_dev_inst *usb; struct sr_config *src; GSList *l; - GSList *devices; + GSList *devices, *found_devices, *renum_devices; GSList *conn_devices; struct libusb_device_descriptor des; - libusb_device **devlist; - unsigned int i, j; + libusb_device **devlist, *dev; + size_t dev_count, dev_idx, ch_idx; + uint8_t bus, addr; + uint16_t pid; const char *conn; - char connection_id[64]; - int64_t fw_updated; - unsigned int dev_addr; + char conn_id[64]; + int ret; + size_t ch_off, ch_max; drvc = di->context; + ctx = drvc->sr_ctx;; conn = NULL; + conn_devices = NULL; for (l = options; l; l = l->next) { src = l->data; switch (src->key) { @@ -157,229 +423,183 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) } } if (conn) - conn_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, conn); - else - conn_devices = NULL; + conn_devices = sr_usb_find(ctx->libusb_ctx, conn); + if (conn && !conn_devices) { + sr_err("Cannot find the specified connection '%s'.", conn); + return NULL; + } - /* Find all LA2016 devices, optionally upload firmware to them. */ + /* + * Find all LA2016 devices, optionally upload firmware to them. + * Defer completion of sdi/devc creation until all (selected) + * devices were found in a usable state, and their models got + * identified which affect their feature set. It appears that + * we cannot communicate to the device within the same USB enum + * cycle, needs another USB enumeration after firmware upload. + */ 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) { - /* - * A connection parameter was specified and - * this device does not match the filter. - */ - continue; - } + found_devices = NULL; + renum_devices = NULL; + ret = libusb_get_device_list(ctx->libusb_ctx, &devlist); + if (ret < 0) { + sr_err("Cannot get device list: %s.", libusb_error_name(ret)); + return devices; + } + dev_count = ret; + for (dev_idx = 0; dev_idx < dev_count; dev_idx++) { + dev = devlist[dev_idx]; + bus = libusb_get_bus_number(dev); + addr = libusb_get_device_address(dev); + + /* Filter by connection when externally specified. */ + for (l = conn_devices; l; l = l->next) { + usb = l->data; + if (usb->bus == bus && usb->address == addr) + break; } - - libusb_get_device_descriptor(devlist[i], &des); - - if (usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)) < 0) + if (conn_devices && !l) { + sr_spew("Bus %hhu, addr %hhu do not match specified filter.", + bus, addr); continue; + } + /* Check USB VID:PID. Get the connection string. */ + libusb_get_device_descriptor(dev, &des); if (des.idVendor != LA2016_VID || des.idProduct != LA2016_PID) continue; + pid = des.idProduct; + ret = usb_get_port_path(dev, conn_id, sizeof(conn_id)); + if (ret < 0) + continue; + sr_dbg("USB enum found %04x:%04x at path %s, %d.%d.", + des.idVendor, des.idProduct, conn_id, bus, addr); + usb = sr_usb_dev_inst_new(bus, addr, NULL); - /* USB identification matches, a device was found. */ - sr_dbg("Found a LA2016 device."); - sdi = g_malloc0(sizeof(struct sr_dev_inst)); + sdi = g_malloc0(sizeof(*sdi)); + sdi->driver = di; sdi->status = SR_ST_INITIALIZING; - sdi->connection_id = g_strdup(connection_id); + sdi->inst_type = SR_INST_USB; + sdi->connection_id = g_strdup(conn_id); + sdi->conn = usb; - fw_updated = 0; - dev_addr = libusb_get_device_address(devlist[i]); - if (des.iProduct != 2) { - sr_info("Device at '%s' has no firmware loaded.", connection_id); + devc = g_malloc0(sizeof(*devc)); + sdi->priv = devc; - if (la2016_upload_firmware(drvc->sr_ctx, devlist[i], des.idProduct) != SR_OK) { + /* + * Load MCU firmware if it is currently missing. Which + * makes the device disappear and renumerate in USB. + * We need to come back another time to communicate to + * this device. + */ + devc->fw_uploaded = 0; + if (des.iProduct != LA2016_IPRODUCT_INDEX) { + sr_info("Uploading MCU firmware to '%s'.", conn_id); + ret = la2016_upload_firmware(sdi, ctx, dev, pid); + if (ret != SR_OK) { sr_err("MCU firmware upload failed."); - g_free(sdi->connection_id); - g_free(sdi); + kingst_la2016_free_sdi(sdi); continue; } - fw_updated = g_get_monotonic_time(); - /* Will re-enumerate. Mark as "unknown address yet". */ - dev_addr = 0xff; + devc->fw_uploaded = g_get_monotonic_time(); + usb->address = 0xff; + renum_devices = g_slist_append(renum_devices, sdi); + continue; } - sdi->vendor = g_strdup("Kingst"); - sdi->model = g_strdup("LA2016"); - - for (j = 0; j < ARRAY_SIZE(channel_names); j++) - sr_channel_new(sdi, j, SR_CHANNEL_LOGIC, TRUE, channel_names[j]); - - devices = g_slist_append(devices, sdi); - - devc = g_malloc0(sizeof(struct dev_context)); - sdi->priv = devc; - devc->fw_updated = fw_updated; - devc->threshold_voltage_idx = 0; - devc->threshold_voltage = logic_threshold_value[devc->threshold_voltage_idx]; - - sdi->status = SR_ST_INACTIVE; - sdi->inst_type = SR_INST_USB; - - sdi->conn = sr_usb_dev_inst_new( - libusb_get_bus_number(devlist[i]), - dev_addr, NULL); + /* + * Communicate to the MCU firmware to access EEPROM data + * which lets us identify the device type. Then stop, to + * share remaining sdi/devc creation with those devices + * which had their MCU firmware uploaded above and which + * get revisited later. + */ + ret = la2016_identify_read(sdi, usb, dev, TRUE); + if (ret != SR_OK || !devc->model) { + sr_err("Unknown or unsupported device type."); + kingst_la2016_free_sdi(sdi); + continue; + } + found_devices = g_slist_append(found_devices, sdi); } libusb_free_device_list(devlist, 1); - g_slist_free_full(conn_devices, (GDestroyNotify)sr_usb_dev_inst_free); + g_slist_free_full(conn_devices, sr_usb_dev_inst_free_cb); - return std_scan_complete(di, devices); -} - -static int la2016_dev_open(struct sr_dev_inst *sdi) -{ - struct sr_dev_driver *di; - libusb_device **devlist; - struct sr_usb_dev_inst *usb; - struct libusb_device_descriptor des; - struct drv_context *drvc; - int ret, i, device_count; - char connection_id[64]; - - di = sdi->driver; - drvc = di->context; - usb = sdi->conn; - ret = SR_ERR; - - device_count = libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist); - if (device_count < 0) { - sr_err("Failed to get device list: %s.", libusb_error_name(device_count)); - return SR_ERR; - } - - for (i = 0; i < device_count; i++) { - libusb_get_device_descriptor(devlist[i], &des); - - if (des.idVendor != LA2016_VID || des.idProduct != LA2016_PID || des.iProduct != 2) + /* + * Wait for devices to re-appear after firmware upload. Append + * the yet unidentified device to the list of found devices, or + * release the previously allocated sdi/devc. + */ + for (l = renum_devices; l; l = l->next) { + sdi = l->data; + devc = sdi->priv; + ret = la2016_identify_wait(sdi); + if (ret != SR_OK || !devc->model) { + sr_dbg("Skipping unusable '%s'.", sdi->connection_id); + kingst_la2016_free_sdi(sdi); continue; - - if ((sdi->status == SR_ST_INITIALIZING) || (sdi->status == SR_ST_INACTIVE)) { - /* Check physical USB bus/port address. */ - if (usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)) < 0) - continue; - - if (strcmp(sdi->connection_id, connection_id)) { - /* Not the device we looked up before. */ - continue; - } - } - - if (!(ret = libusb_open(devlist[i], &usb->devhdl))) { - if (usb->address == 0xff) { - /* - * First encounter after firmware upload. - * Grab current address after enumeration. - */ - usb->address = libusb_get_device_address(devlist[i]); - } - } else { - sr_err("Failed to open device: %s.", libusb_error_name(ret)); - ret = SR_ERR; - break; } + found_devices = g_slist_append(found_devices, sdi); + } + g_slist_free(renum_devices); - ret = libusb_claim_interface(usb->devhdl, USB_INTERFACE); - if (ret == LIBUSB_ERROR_BUSY) { - sr_err("Cannot claim USB interface. Another program or driver using it?"); - ret = SR_ERR; - break; - } else if (ret == LIBUSB_ERROR_NO_DEVICE) { - sr_err("Device has been disconnected."); - ret = SR_ERR; - break; - } else if (ret != 0) { - sr_err("Cannot claim USB interface: %s.", libusb_error_name(ret)); - ret = SR_ERR; - break; - } + /* + * All found devices got identified, their type is known here. + * Complete the sdi/devc creation. Assign default settings + * because the vendor firmware would not let us read back the + * previously written configuration. + */ + for (l = found_devices; l; l = l->next) { + sdi = l->data; + devc = sdi->priv; - if ((ret = la2016_init_device(sdi)) != SR_OK) { - sr_err("Cannot initialize device."); - break; + sdi->vendor = g_strdup("Kingst"); + sdi->model = g_strdup(devc->model->name); + ch_off = 0; + + /* Create the logic channels. */ + ch_max = ARRAY_SIZE(channel_names_logic); + if (ch_max > devc->model->channel_count) + ch_max = devc->model->channel_count; + for (ch_idx = 0; ch_idx < ch_max; ch_idx++) { + sr_channel_new(sdi, ch_off, + SR_CHANNEL_LOGIC, TRUE, + channel_names_logic[ch_idx]); + ch_off++; } - sr_info("Opened device on %d.%d (logical) / %s (physical), interface %d.", - usb->bus, usb->address, sdi->connection_id, USB_INTERFACE); - - ret = SR_OK; - - break; - } - - libusb_free_device_list(devlist, 1); + sr_sw_limits_init(&devc->sw_limits); + devc->sw_limits.limit_samples = 0; + devc->capture_ratio = 50; + devc->cur_samplerate = devc->model->samplerate; + devc->threshold_voltage_idx = 0; + devc->threshold_voltage = logic_threshold_value[devc->threshold_voltage_idx]; - if (ret != SR_OK) { - if (usb->devhdl) { - libusb_release_interface(usb->devhdl, USB_INTERFACE); - libusb_close(usb->devhdl); - usb->devhdl = NULL; - } - return SR_ERR; + sdi->status = SR_ST_INACTIVE; + devices = g_slist_append(devices, sdi); } + g_slist_free(found_devices); - return SR_OK; + return std_scan_complete(di, devices); } static int dev_open(struct sr_dev_inst *sdi) { - struct dev_context *devc; - int64_t timediff_us, timediff_ms; - uint64_t reset_done; - uint64_t now; int ret; - devc = sdi->priv; + ret = la2016_open_enum(sdi); + if (ret != SR_OK) { + sr_err("Cannot open device."); + return ret; + } /* - * When the sigrok driver recently uploaded firmware, wait for - * the FX2 to re-enumerate. Deal with the condition that the - * MCU can take some 2000ms to be gone from the bus before it - * re-appears executing the recently uploaded firmware. + * Setup a default configuration of device features. This + * affects the logic threshold, PWM channels, and similar. */ - ret = SR_ERR; - if (devc->fw_updated > 0) { - sr_info("Waiting for device to reset after firmware upload."); - reset_done = devc->fw_updated; - reset_done += 1800 * 1000; /* 1.8 seconds */ - now = g_get_monotonic_time(); - if (reset_done > now) - g_usleep(reset_done - now); - timediff_ms = 0; - while (timediff_ms < MAX_RENUM_DELAY_MS) { - g_usleep(200 * 1000); - - timediff_us = g_get_monotonic_time() - devc->fw_updated; - timediff_ms = timediff_us / 1000; - - if ((ret = la2016_dev_open(sdi)) == SR_OK) - break; - sr_spew("Waited %" PRIi64 "ms.", timediff_ms); - } - if (ret != SR_OK) { - sr_err("Device failed to re-enumerate."); - return SR_ERR; - } - sr_info("Device came back after %" PRIi64 "ms.", timediff_ms); - } else { - ret = la2016_dev_open(sdi); - } - + ret = la2016_init_params(sdi); if (ret != SR_OK) { - sr_err("Cannot open device."); - return SR_ERR; + sr_err("Cannot initialize device's hardware."); + return ret; } return SR_OK; @@ -394,13 +614,11 @@ static int dev_close(struct sr_dev_inst *sdi) if (!usb->devhdl) return SR_ERR_BUG; - la2016_deinit_device(sdi); + la2016_deinit_hardware(sdi); sr_info("Closing device on %d.%d (logical) / %s (physical) interface %d.", usb->bus, usb->address, sdi->connection_id, USB_INTERFACE); - libusb_release_interface(usb->devhdl, USB_INTERFACE); - libusb_close(usb->devhdl); - usb->devhdl = NULL; + la2016_close_usb(sdi->conn); return SR_OK; } @@ -411,6 +629,7 @@ static int config_get(uint32_t key, GVariant **data, struct dev_context *devc; struct sr_usb_dev_inst *usb; double rounded; + const char *label; (void)cg; @@ -436,8 +655,8 @@ static int config_get(uint32_t key, GVariant **data, *data = g_variant_new_uint64(devc->cur_samplerate); break; case SR_CONF_LIMIT_SAMPLES: - *data = g_variant_new_uint64(devc->limit_samples); - break; + case SR_CONF_LIMIT_MSEC: + return sr_sw_limits_config_get(&devc->sw_limits, key, data); case SR_CONF_CAPTURE_RATIO: *data = g_variant_new_uint64(devc->capture_ratio); break; @@ -446,7 +665,8 @@ static int config_get(uint32_t key, GVariant **data, *data = std_gvar_tuple_double(rounded, rounded + 0.1); return SR_OK; case SR_CONF_LOGIC_THRESHOLD: - *data = g_variant_new_string(logic_threshold[devc->threshold_voltage_idx]); + label = logic_threshold[devc->threshold_voltage_idx]; + *data = g_variant_new_string(label); break; case SR_CONF_LOGIC_THRESHOLD_CUSTOM: *data = g_variant_new_double(devc->threshold_voltage); @@ -475,22 +695,21 @@ static int config_set(uint32_t key, GVariant *data, devc->cur_samplerate = g_variant_get_uint64(data); break; case SR_CONF_LIMIT_SAMPLES: - devc->limit_samples = g_variant_get_uint64(data); - break; + case SR_CONF_LIMIT_MSEC: + return sr_sw_limits_config_set(&devc->sw_limits, key, data); case SR_CONF_CAPTURE_RATIO: devc->capture_ratio = g_variant_get_uint64(data); break; case SR_CONF_VOLTAGE_THRESHOLD: g_variant_get(data, "(dd)", &low, &high); devc->threshold_voltage = (low + high) / 2.0; - devc->threshold_voltage_idx = MAX_NUM_LOGIC_THRESHOLD_ENTRIES - 1; /* USER */ + devc->threshold_voltage_idx = LOGIC_THRESHOLD_IDX_USER; break; case SR_CONF_LOGIC_THRESHOLD: { - if ((idx = std_str_idx(data, logic_threshold, MAX_NUM_LOGIC_THRESHOLD_ENTRIES)) < 0) + idx = std_str_idx(data, ARRAY_AND_SIZE(logic_threshold)); + if (idx < 0) return SR_ERR_ARG; - if (idx == MAX_NUM_LOGIC_THRESHOLD_ENTRIES - 1) { - /* user threshold */ - } else { + if (idx != LOGIC_THRESHOLD_IDX_USER) { devc->threshold_voltage = logic_threshold_value[idx]; } devc->threshold_voltage_idx = idx; @@ -511,23 +730,25 @@ static int config_list(uint32_t key, GVariant **data, { struct dev_context *devc; + devc = sdi ? sdi->priv : NULL; + switch (key) { case SR_CONF_SCAN_OPTIONS: case SR_CONF_DEVICE_OPTIONS: - return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts); + return STD_CONFIG_LIST(key, data, sdi, cg, + scanopts, drvopts, devopts); case SR_CONF_SAMPLERATE: if (!sdi) return SR_ERR_ARG; - devc = sdi->priv; - if (devc->max_samplerate == SR_MHZ(200)) { - *data = std_gvar_samplerates(ARRAY_AND_SIZE(samplerates_la2016)); - } - else { - *data = std_gvar_samplerates(ARRAY_AND_SIZE(samplerates_la1016)); - } + if (devc->model->samplerate == SR_MHZ(500)) + *data = std_gvar_samplerates(ARRAY_AND_SIZE(rates_500mhz)); + else if (devc->model->samplerate == SR_MHZ(200)) + *data = std_gvar_samplerates(ARRAY_AND_SIZE(rates_200mhz)); + else + *data = std_gvar_samplerates(ARRAY_AND_SIZE(rates_100mhz)); break; case SR_CONF_LIMIT_SAMPLES: - *data = std_gvar_tuple_u64(LA2016_NUM_SAMPLES_MIN, LA2016_NUM_SAMPLES_MAX); + *data = std_gvar_tuple_u64(0, LA2016_NUM_SAMPLES_MAX); break; case SR_CONF_VOLTAGE_THRESHOLD: *data = std_gvar_min_max_step_thresholds( @@ -538,7 +759,7 @@ static int config_list(uint32_t key, GVariant **data, *data = std_gvar_array_i32(ARRAY_AND_SIZE(trigger_matches)); break; case SR_CONF_LOGIC_THRESHOLD: - *data = g_variant_new_strv(logic_threshold, MAX_NUM_LOGIC_THRESHOLD_ENTRIES); + *data = g_variant_new_strv(ARRAY_AND_SIZE(logic_threshold)); break; default: return SR_ERR_NA; @@ -547,62 +768,47 @@ static int config_list(uint32_t key, GVariant **data, return SR_OK; } -static int configure_channels(const struct sr_dev_inst *sdi) -{ - struct dev_context *devc; - - devc = sdi->priv; - devc->cur_channels = 0; - devc->num_channels = 0; - - for (GSList *l = sdi->channels; l; l = l->next) { - struct sr_channel *ch = (struct sr_channel*)l->data; - if (ch->enabled == FALSE) - continue; - devc->cur_channels |= 1 << ch->index; - devc->num_channels++; - } - - return SR_OK; -} - static int dev_acquisition_start(const struct sr_dev_inst *sdi) { struct sr_dev_driver *di; struct drv_context *drvc; + struct sr_context *ctx; struct dev_context *devc; int ret; di = sdi->driver; drvc = di->context; + ctx = drvc->sr_ctx;; devc = sdi->priv; - if (configure_channels(sdi) != SR_OK) { - sr_err("Cannot configure channels."); - return SR_ERR; + if (!devc->feed_queue) { + devc->feed_queue = feed_queue_logic_alloc(sdi, + LA2016_CONVBUFFER_SIZE, sizeof(uint16_t)); + if (!devc->feed_queue) { + sr_err("Cannot allocate buffer for session feed."); + return SR_ERR_MALLOC; + } } - devc->convbuffer_size = 4 * 1024 * 1024; - if (!(devc->convbuffer = g_try_malloc(devc->convbuffer_size))) { - sr_err("Cannot allocate conversion buffer."); - return SR_ERR_MALLOC; - } + sr_sw_limits_acquisition_start(&devc->sw_limits); - if ((ret = la2016_setup_acquisition(sdi)) != SR_OK) { - g_free(devc->convbuffer); - devc->convbuffer = NULL; + ret = la2016_setup_acquisition(sdi); + if (ret != SR_OK) { + feed_queue_logic_free(devc->feed_queue); + devc->feed_queue = NULL; return ret; } - devc->ctx = drvc->sr_ctx; - - if ((ret = la2016_start_acquisition(sdi)) != SR_OK) { + ret = la2016_start_acquisition(sdi); + if (ret != SR_OK) { la2016_abort_acquisition(sdi); + feed_queue_logic_free(devc->feed_queue); + devc->feed_queue = NULL; return ret; } - devc->have_trigger = 0; - usb_source_add(sdi->session, drvc->sr_ctx, 50, + devc->completion_seen = FALSE; + usb_source_add(sdi->session, ctx, 50, la2016_receive_data, (void *)sdi); std_session_send_df_header(sdi);