X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Ffx2lafw%2Ffx2lafw.c;h=a0955371a21e105fd129208a03e7c6d4ef264691;hb=063e7aef6d41d4c44591ff93672079998bf9622f;hp=e74312fb77b8a745d770bd007f7fafed4c7e03d6;hpb=886a52b6fbffb0fd06849c928cf9fd31a0d4657b;p=libsigrok.git diff --git a/hardware/fx2lafw/fx2lafw.c b/hardware/fx2lafw/fx2lafw.c index e74312fb..a0955371 100644 --- a/hardware/fx2lafw/fx2lafw.c +++ b/hardware/fx2lafw/fx2lafw.c @@ -82,32 +82,18 @@ static const struct fx2lafw_profile supported_fx2[] = { }; static const int hwcaps[] = { - SR_HWCAP_LOGIC_ANALYZER, - SR_HWCAP_SAMPLERATE, + SR_CONF_LOGIC_ANALYZER, + SR_CONF_SAMPLERATE, /* These are really implemented in the driver, not the hardware. */ - SR_HWCAP_LIMIT_SAMPLES, - SR_HWCAP_CONTINUOUS, + SR_CONF_LIMIT_SAMPLES, + SR_CONF_CONTINUOUS, 0, }; static const char *probe_names[] = { - "0", - "1", - "2", - "3", - "4", - "5", - "6", - "7", - "8", - "9", - "10", - "11", - "12", - "13", - "14", - "15", + "0", "1", "2", "3", "4", "5", "6", "7", + "8", "9", "10", "11", "12", "13", "14", "15", NULL, }; @@ -139,12 +125,10 @@ static const struct sr_samplerates samplerates = { }; SR_PRIV struct sr_dev_driver fx2lafw_driver_info; -static struct sr_dev_driver *fdi = &fx2lafw_driver_info; +static struct sr_dev_driver *di = &fx2lafw_driver_info; static int hw_dev_close(struct sr_dev_inst *sdi); -static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, - const void *value); -static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi, - void *cb_data); +static int config_set(int id, const void *value, const struct sr_dev_inst *sdi); +static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data); /** * Check the USB configuration to determine if this is an fx2lafw device. @@ -170,7 +154,7 @@ static gboolean check_conf_profile(libusb_device *dev) break; if (libusb_get_string_descriptor_ascii(hdl, - des.iManufacturer, strdesc, sizeof(strdesc)) < 0) + des.iManufacturer, strdesc, sizeof(strdesc)) < 0) break; if (strncmp((const char *)strdesc, "sigrok", 6)) break; @@ -195,28 +179,30 @@ static int fx2lafw_dev_open(struct sr_dev_inst *sdi) libusb_device **devlist; struct libusb_device_descriptor des; struct dev_context *devc; + struct drv_context *drvc; struct version_info vi; - int ret, skip, i; + int ret, skip, i, device_count; uint8_t revid; + drvc = di->priv; devc = sdi->priv; if (sdi->status == SR_ST_ACTIVE) - /* already in use */ + /* Device is already in use. */ return SR_ERR; skip = 0; - const int device_count = libusb_get_device_list(NULL, &devlist); + device_count = libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist); if (device_count < 0) { - sr_err("fx2lafw: Failed to retrieve device list (%d)", - device_count); + sr_err("Failed to get device list: %s.", + libusb_error_name(device_count)); return SR_ERR; } for (i = 0; i < device_count; i++) { if ((ret = libusb_get_device_descriptor(devlist[i], &des))) { - sr_err("fx2lafw: Failed to get device descriptor: %d.", - ret); + sr_err("Failed to get device descriptor: %s.", + libusb_error_name(ret)); continue; } @@ -237,32 +223,32 @@ static int fx2lafw_dev_open(struct sr_dev_inst *sdi) */ if (libusb_get_bus_number(devlist[i]) != devc->usb->bus || libusb_get_device_address(devlist[i]) != devc->usb->address) - /* this is not the one */ + /* This is not the one. */ continue; } if (!(ret = libusb_open(devlist[i], &devc->usb->devhdl))) { if (devc->usb->address == 0xff) /* - * first time we touch this device after firmware upload, - * so we don't know the address yet. + * 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]); } else { - sr_err("fx2lafw: Failed to open device: %d.", ret); + sr_err("Failed to open device: %s.", + libusb_error_name(ret)); break; } ret = command_get_fw_version(devc->usb->devhdl, &vi); if (ret != SR_OK) { - sr_err("fx2lafw: Failed to retrieve " - "firmware version information."); + sr_err("Failed to get firmware version."); break; } ret = command_get_revid_version(devc->usb->devhdl, &revid); if (ret != SR_OK) { - sr_err("fx2lafw: Failed to retrieve REVID."); + sr_err("Failed to get REVID."); break; } @@ -272,17 +258,20 @@ static int fx2lafw_dev_open(struct sr_dev_inst *sdi) * Different minor versions are OK, they should be compatible. */ if (vi.major != FX2LAFW_REQUIRED_VERSION_MAJOR) { - sr_err("fx2lafw: Expected firmware version %d.x, " + sr_err("Expected firmware version %d.x, " "got %d.%d.", FX2LAFW_REQUIRED_VERSION_MAJOR, vi.major, vi.minor); break; } sdi->status = SR_ST_ACTIVE; - sr_info("fx2lafw: Opened device %d on %d.%d " - "interface %d, firmware %d.%d, REVID %d.", + sr_info("Opened device %d on %d.%d, " + "interface %d, firmware %d.%d.", sdi->index, devc->usb->bus, devc->usb->address, - USB_INTERFACE, vi.major, vi.minor, revid); + USB_INTERFACE, vi.major, vi.minor); + + sr_info("Detected REVID=%d, it's a Cypress CY7C68013%s.", + revid, (revid != 1) ? " (FX2)" : "A (FX2LP)"); break; } @@ -349,7 +338,7 @@ static struct dev_context *fx2lafw_dev_new(void) struct dev_context *devc; if (!(devc = g_try_malloc0(sizeof(struct dev_context)))) { - sr_err("fx2lafw: %s: devc malloc failed.", __func__); + sr_err("Device context malloc failed."); return NULL; } @@ -366,20 +355,18 @@ static int clear_instances(void) struct dev_context *devc; int ret; - drvc = fdi->priv; + 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("fx2lafw: %s: sdi was NULL, continuing.", - __func__); + 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("fx2lafw: %s: sdi->priv was NULL, continuing", - __func__); + sr_err("sdi->priv was NULL, continuing."); ret = SR_ERR_BUG; continue; } @@ -395,29 +382,9 @@ static int clear_instances(void) return ret; } - -/* - * API callbacks - */ - -static int hw_init(void) +static int hw_init(struct sr_context *sr_ctx) { - struct drv_context *drvc; - - if (!(drvc = g_try_malloc0(sizeof(struct drv_context)))) { - sr_err("fx2lafw: driver context malloc failed."); - return SR_ERR_MALLOC; - } - - if (libusb_init(NULL) != 0) { - g_free(drvc); - sr_warn("fx2lafw: Failed to initialize libusb."); - return SR_ERR; - } - - fdi->priv = drvc; - - return SR_OK; + return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN); } static GSList *hw_scan(GSList *options) @@ -432,21 +399,22 @@ static GSList *hw_scan(GSList *options) libusb_device **devlist; int devcnt, num_logic_probes, ret, i, j; - /* Avoid compiler warnings. */ (void)options; - drvc = fdi->priv; + + drvc = di->priv; /* This scan always invalidates any previous scans. */ clear_instances(); /* Find all fx2lafw compatible devices and upload firmware to them. */ devices = NULL; - libusb_get_device_list(NULL, &devlist); + libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist); for (i = 0; devlist[i]; i++) { if ((ret = libusb_get_device_descriptor( devlist[i], &des)) != 0) { - sr_warn("fx2lafw: Failed to get device descriptor: %d.", ret); + sr_warn("Failed to get device descriptor: %s.", + libusb_error_name(ret)); continue; } @@ -458,7 +426,7 @@ static GSList *hw_scan(GSList *options) } } - /* Skip if the device was not found */ + /* Skip if the device was not found. */ if (!prof) continue; @@ -467,7 +435,7 @@ static GSList *hw_scan(GSList *options) prof->vendor, prof->model, prof->model_version); if (!sdi) return NULL; - sdi->driver = fdi; + sdi->driver = di; /* Fill in probelist according to this device's profile. */ num_logic_probes = prof->dev_caps & DEV_CAPS_16BIT ? 16 : 8; @@ -486,7 +454,7 @@ static GSList *hw_scan(GSList *options) if (check_conf_profile(devlist[i])) { /* Already has the firmware, so fix the new address. */ - sr_dbg("fx2lafw: Found an fx2lafw device."); + sr_dbg("Found an fx2lafw device."); sdi->status = SR_ST_INACTIVE; devc->usb = sr_usb_dev_inst_new (libusb_get_bus_number(devlist[i]), @@ -494,10 +462,10 @@ static GSList *hw_scan(GSList *options) } else { if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION, prof->firmware) == SR_OK) - /* Remember when the firmware on this device was updated */ + /* Store when this device's FW was updated. */ devc->fw_updated = g_get_monotonic_time(); else - sr_err("fx2lafw: Firmware upload failed for " + sr_err("Firmware upload failed for " "device %d.", devcnt); devc->usb = sr_usb_dev_inst_new (libusb_get_bus_number(devlist[i]), 0xff, NULL); @@ -512,7 +480,7 @@ static GSList *hw_dev_list(void) { struct drv_context *drvc; - drvc = fdi->priv; + drvc = di->priv; return drvc->instances; } @@ -531,8 +499,8 @@ static int hw_dev_open(struct sr_dev_inst *sdi) */ ret = SR_ERR; if (devc->fw_updated > 0) { - sr_info("fx2lafw: Waiting for device to reset."); - /* takes at least 300ms for the FX2 to be gone from the USB bus */ + sr_info("Waiting for device to reset."); + /* Takes >= 300ms for the FX2 to be gone from the USB bus. */ g_usleep(300 * 1000); timediff_ms = 0; while (timediff_ms < MAX_RENUM_DELAY_MS) { @@ -542,33 +510,38 @@ static int hw_dev_open(struct sr_dev_inst *sdi) timediff_us = g_get_monotonic_time() - devc->fw_updated; timediff_ms = timediff_us / 1000; - sr_spew("fx2lafw: waited %" PRIi64 " ms", timediff_ms); + sr_spew("Waited %" PRIi64 "ms.", timediff_ms); + } + if (ret != SR_OK) { + sr_err("Device failed to renumerate."); + return SR_ERR; } - sr_info("fx2lafw: Device came back after %d ms.", timediff_ms); + sr_info("Device came back after %" PRIi64 "ms.", timediff_ms); } else { + sr_info("Firmware upload was not needed."); ret = fx2lafw_dev_open(sdi); } if (ret != SR_OK) { - sr_err("fx2lafw: Unable to open device."); + sr_err("Unable to open device."); return SR_ERR; } + devc = sdi->priv; ret = libusb_claim_interface(devc->usb->devhdl, USB_INTERFACE); if (ret != 0) { switch(ret) { case LIBUSB_ERROR_BUSY: - sr_err("fx2lafw: Unable to claim USB interface. Another " - "program or driver has already claimed it."); + sr_err("Unable to claim USB interface. Another " + "program or driver has already claimed it."); break; - case LIBUSB_ERROR_NO_DEVICE: - sr_err("fx2lafw: Device has been disconnected."); + sr_err("Device has been disconnected."); break; - default: - sr_err("fx2lafw: Unable to claim interface: %d.", ret); + sr_err("Unable to claim interface: %s.", + libusb_error_name(ret)); break; } @@ -577,8 +550,8 @@ static int hw_dev_open(struct sr_dev_inst *sdi) if (devc->cur_samplerate == 0) { /* Samplerate hasn't been set; default to the slowest one. */ - if (hw_dev_config_set(sdi, SR_HWCAP_SAMPLERATE, - &supported_samplerates[0]) == SR_ERR) + if (config_set(SR_CONF_SAMPLERATE, &supported_samplerates[0], + sdi) == SR_ERR) return SR_ERR; } @@ -593,7 +566,7 @@ static int hw_dev_close(struct sr_dev_inst *sdi) if (devc->usb->devhdl == NULL) return SR_ERR; - sr_info("fx2lafw: Closing device %d on %d.%d interface %d.", + 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); @@ -608,47 +581,23 @@ static int hw_cleanup(void) struct drv_context *drvc; int ret; - if (!(drvc = fdi->priv)) + if (!(drvc = di->priv)) return SR_OK; ret = clear_instances(); - libusb_exit(NULL); - g_free(drvc); - fdi->priv = NULL; + di->priv = NULL; return ret; } -static int hw_info_get(int info_id, const void **data, - const struct sr_dev_inst *sdi) +static int config_get(int id, const void **data, const struct sr_dev_inst *sdi) { struct dev_context *devc; - switch (info_id) { - case SR_DI_HWCAPS: - *data = hwcaps; - break; - case SR_DI_NUM_PROBES: - if (sdi) { - devc = sdi->priv; - *data = GINT_TO_POINTER( - (devc->profile->dev_caps & DEV_CAPS_16BIT) ? - 16 : 8); - } else - return SR_ERR; - break; - case SR_DI_PROBE_NAMES: - *data = probe_names; - break; - case SR_DI_SAMPLERATES: - *data = &samplerates; - break; - case SR_DI_TRIGGER_TYPES: - *data = TRIGGER_TYPES; - break; - case SR_DI_CUR_SAMPLERATE: + switch (id) { + case SR_CONF_SAMPLERATE: if (sdi) { devc = sdi->priv; *data = &devc->cur_samplerate; @@ -662,18 +611,17 @@ static int hw_info_get(int info_id, const void **data, 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, const void *value, const struct sr_dev_inst *sdi) { struct dev_context *devc; int ret; devc = sdi->priv; - if (hwcap == SR_HWCAP_SAMPLERATE) { + if (id == SR_CONF_SAMPLERATE) { devc->cur_samplerate = *(const uint64_t *)value; ret = SR_OK; - } else if (hwcap == SR_HWCAP_LIMIT_SAMPLES) { + } else if (id == SR_CONF_LIMIT_SAMPLES) { devc->limit_samples = *(const uint64_t *)value; ret = SR_OK; } else { @@ -683,17 +631,41 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap, return ret; } +static int config_list(int key, const void **data, const struct sr_dev_inst *sdi) +{ + + (void)sdi; + + switch (key) { + case SR_CONF_DEVICE_OPTIONS: + *data = hwcaps; + break; + case SR_CONF_SAMPLERATE: + *data = &samplerates; + break; + case SR_CONF_TRIGGER_TYPE: + *data = TRIGGER_TYPE; + break; + default: + return SR_ERR_ARG; + } + + return SR_OK; +} + static int receive_data(int fd, int revents, void *cb_data) { struct timeval tv; + struct drv_context *drvc; - /* Avoid compiler warnings. */ (void)fd; (void)revents; (void)cb_data; + drvc = di->priv; + tv.tv_sec = tv.tv_usec = 0; - libusb_handle_events_timeout(NULL, &tv); + libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv); return TRUE; } @@ -713,16 +685,16 @@ static void abort_acquisition(struct dev_context *devc) static void finish_acquisition(struct dev_context *devc) { struct sr_datafeed_packet packet; + struct drv_context *drvc = di->priv; + const struct libusb_pollfd **lupfd; int i; - - /* Terminate session */ + /* Terminate session. */ packet.type = SR_DF_END; sr_session_send(devc->session_dev_id, &packet); - /* Remove fds from polling */ - const struct libusb_pollfd **const lupfd = - libusb_get_pollfds(NULL); + /* Remove fds from polling. */ + lupfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx); for (i = 0; lupfd[i]; i++) sr_source_remove(lupfd[i]->fd); free(lupfd); /* NOT g_free()! */ @@ -733,9 +705,11 @@ static void finish_acquisition(struct dev_context *devc) static void free_transfer(struct libusb_transfer *transfer) { - struct dev_context *devc = transfer->user_data; + struct dev_context *devc; unsigned int i; + devc = transfer->user_data; + g_free(transfer->buffer); transfer->buffer = NULL; libusb_free_transfer(transfer); @@ -750,17 +724,19 @@ static void free_transfer(struct libusb_transfer *transfer) devc->submitted_transfers--; if (devc->submitted_transfers == 0) finish_acquisition(devc); - } static void resubmit_transfer(struct libusb_transfer *transfer) { - if (libusb_submit_transfer(transfer) != 0) { - free_transfer(transfer); - /* TODO: Stop session? */ - /* TODO: Better error message. */ - sr_err("fx2lafw: %s: libusb_submit_transfer error.", __func__); - } + int ret; + + if ((ret = libusb_submit_transfer(transfer)) == LIBUSB_SUCCESS) + return; + + free_transfer(transfer); + /* TODO: Stop session? */ + + sr_err("%s: %s", __func__, libusb_error_name(ret)); } static void receive_transfer(struct libusb_transfer *transfer) @@ -768,8 +744,12 @@ static void receive_transfer(struct libusb_transfer *transfer) gboolean packet_has_error = FALSE; struct sr_datafeed_packet packet; struct sr_datafeed_logic logic; - struct dev_context *devc = transfer->user_data; - int trigger_offset, i; + struct dev_context *devc; + int trigger_offset, i, sample_width, cur_sample_count; + int trigger_offset_bytes; + uint8_t *cur_buf; + + devc = transfer->user_data; /* * If acquisition has already ended, just free any queued up @@ -780,13 +760,13 @@ static void receive_transfer(struct libusb_transfer *transfer) return; } - sr_info("fx2lafw: receive_transfer(): status %d received %d bytes.", + sr_info("receive_transfer(): status %d received %d bytes.", transfer->status, transfer->actual_length); /* Save incoming transfer before reusing the transfer struct. */ - uint8_t *const cur_buf = transfer->buffer; - const int sample_width = devc->sample_wide ? 2 : 1; - const int cur_sample_count = transfer->actual_length / sample_width; + cur_buf = transfer->buffer; + sample_width = devc->sample_wide ? 2 : 1; + cur_sample_count = transfer->actual_length / sample_width; switch (transfer->status) { case LIBUSB_TRANSFER_NO_DEVICE: @@ -794,7 +774,7 @@ static void receive_transfer(struct libusb_transfer *transfer) free_transfer(transfer); return; case LIBUSB_TRANSFER_COMPLETED: - case LIBUSB_TRANSFER_TIMED_OUT: /* We may have received some data though */ + case LIBUSB_TRANSFER_TIMED_OUT: /* We may have received some data though. */ break; default: packet_has_error = TRUE; @@ -846,8 +826,8 @@ static void receive_transfer(struct libusb_transfer *transfer) sr_session_send(devc->session_dev_id, &packet); /* - * Send the samples that triggered it, since we're - * skipping past them. + * Send the samples that triggered it, + * since we're skipping past them. */ packet.type = SR_DF_LOGIC; packet.payload = &logic; @@ -878,7 +858,7 @@ static void receive_transfer(struct libusb_transfer *transfer) if (devc->trigger_stage == TRIGGER_FIRED) { /* Send the incoming transfer to the session bus. */ - const int trigger_offset_bytes = trigger_offset * sample_width; + trigger_offset_bytes = trigger_offset * sample_width; packet.type = SR_DF_LOGIC; packet.payload = &logic; logic.length = transfer->actual_length - trigger_offset_bytes; @@ -912,8 +892,10 @@ static size_t get_buffer_size(struct dev_context *devc) { size_t s; - /* The buffer should be large enough to hold 10ms of data and a multiple - * of 512. */ + /* + * The buffer should be large enough to hold 10ms of data and + * a multiple of 512. + */ s = 10 * to_bytes_per_ms(devc->cur_samplerate); return (s + 511) & ~511; } @@ -922,7 +904,7 @@ static unsigned int get_number_of_transfers(struct dev_context *devc) { unsigned int n; - /* Total buffer size should be able to hold about 500ms of data */ + /* Total buffer size should be able to hold about 500ms of data. */ n = 500 * to_bytes_per_ms(devc->cur_samplerate) / get_buffer_size(devc); if (n > NUM_SIMUL_TRANSFERS) @@ -938,7 +920,7 @@ static unsigned int get_timeout(struct dev_context *devc) total_size = get_buffer_size(devc) * get_number_of_transfers(devc); timeout = total_size / to_bytes_per_ms(devc->cur_samplerate); - return timeout + timeout / 4; /* Leave a headroom of 25% percent */ + return timeout + timeout / 4; /* Leave a headroom of 25% percent. */ } static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, @@ -946,20 +928,23 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, { struct sr_datafeed_packet packet; struct sr_datafeed_header header; - struct sr_datafeed_meta_logic meta; struct dev_context *devc; + struct drv_context *drvc; struct libusb_transfer *transfer; const struct libusb_pollfd **lupfd; - unsigned int i; + unsigned int i, timeout, num_transfers; int ret; unsigned char *buf; + size_t size; + drvc = di->priv; devc = sdi->priv; + if (devc->submitted_transfers != 0) return SR_ERR; if (configure_probes(sdi) != SR_OK) { - sr_err("fx2lafw: failed to configured probes"); + sr_err("Failed to configure probes."); return SR_ERR; } @@ -967,13 +952,13 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, devc->num_samples = 0; devc->empty_transfer_count = 0; - const unsigned int timeout = get_timeout(devc); - const unsigned int num_transfers = get_number_of_transfers(devc); - const size_t size = get_buffer_size(devc); + timeout = get_timeout(devc); + num_transfers = get_number_of_transfers(devc); + size = get_buffer_size(devc); devc->transfers = g_try_malloc0(sizeof(*devc->transfers) * num_transfers); if (!devc->transfers) { - sr_err("fx2lafw: USB transfers malloc failed."); + sr_err("USB transfers malloc failed."); return SR_ERR_MALLOC; } @@ -981,14 +966,16 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, for (i = 0; i < num_transfers; i++) { if (!(buf = g_try_malloc(size))) { - sr_err("fx2lafw: %s: buf malloc failed.", __func__); + sr_err("USB transfer buffer malloc failed."); return SR_ERR_MALLOC; } transfer = libusb_alloc_transfer(0); libusb_fill_bulk_transfer(transfer, devc->usb->devhdl, 2 | LIBUSB_ENDPOINT_IN, buf, size, receive_transfer, devc, timeout); - if (libusb_submit_transfer(transfer) != 0) { + if ((ret = libusb_submit_transfer(transfer)) != 0) { + sr_err("Failed to submit transfer: %s.", + libusb_error_name(ret)); libusb_free_transfer(transfer); g_free(buf); abort_acquisition(devc); @@ -998,7 +985,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, devc->submitted_transfers++; } - lupfd = libusb_get_pollfds(NULL); + lupfd = libusb_get_pollfds(drvc->sr_ctx->libusb_ctx); for (i = 0; lupfd[i]; i++) sr_source_add(lupfd[i]->fd, lupfd[i]->events, timeout, receive_data, NULL); @@ -1010,14 +997,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, gettimeofday(&header.starttime, NULL); sr_session_send(cb_data, &packet); - /* Send metadata about the SR_DF_LOGIC packets to come. */ - packet.type = SR_DF_META_LOGIC; - packet.payload = &meta; - meta.samplerate = devc->cur_samplerate; - meta.num_probes = devc->sample_wide ? 16 : 8; - sr_session_send(cb_data, &packet); - - if ((ret = command_start_acquisition (devc->usb->devhdl, + if ((ret = command_start_acquisition(devc->usb->devhdl, devc->cur_samplerate, devc->sample_wide)) != SR_OK) { abort_acquisition(devc); return ret; @@ -1027,11 +1007,8 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, } /* TODO: This stops acquisition on ALL devices, ignoring dev_index. */ -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) { - - /* Avoid compiler warnings. */ (void)cb_data; abort_acquisition(sdi->priv); @@ -1048,10 +1025,11 @@ SR_PRIV struct sr_dev_driver fx2lafw_driver_info = { .scan = hw_scan, .dev_list = hw_dev_list, .dev_clear = clear_instances, + .config_get = config_get, + .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, .dev_acquisition_stop = hw_dev_acquisition_stop, .priv = NULL,