]> sigrok.org Git - libsigrok.git/blobdiff - src/hardware/fx2lafw/api.c
sr_dev_close(): Set status to SR_ST_INACTIVE.
[libsigrok.git] / src / hardware / fx2lafw / api.c
index dd82729ec9a2b398c272a3160a586c16f3bc6c33..547f7229d4169c0741879d60857f7e28d9ef994e 100644 (file)
@@ -20,7 +20,6 @@
 
 #include <config.h>
 #include "protocol.h"
-#include "dslogic.h"
 #include <math.h>
 
 static const struct fx2lafw_profile supported_fx2[] = {
@@ -54,33 +53,6 @@ static const struct fx2lafw_profile supported_fx2[] = {
                "fx2lafw-cwav-usbeezx.fw",
                0, NULL, NULL},
 
-       /* DreamSourceLab DSLogic (before FW upload) */
-       { 0x2a0e, 0x0001, "DreamSourceLab", "DSLogic", NULL,
-               "dreamsourcelab-dslogic-fx2.fw",
-               DEV_CAPS_16BIT, NULL, NULL},
-       /* DreamSourceLab DSLogic (after FW upload) */
-       { 0x2a0e, 0x0001, "DreamSourceLab", "DSLogic", NULL,
-               "dreamsourcelab-dslogic-fx2.fw",
-               DEV_CAPS_16BIT, "DreamSourceLab", "DSLogic"},
-
-       /* DreamSourceLab DSCope (before FW upload) */
-       { 0x2a0e, 0x0002, "DreamSourceLab", "DSCope", NULL,
-               "dreamsourcelab-dscope-fx2.fw",
-               DEV_CAPS_16BIT, NULL, NULL},
-       /* DreamSourceLab DSCope (after FW upload) */
-       { 0x2a0e, 0x0002, "DreamSourceLab", "DSCope", NULL,
-               "dreamsourcelab-dscope-fx2.fw",
-               DEV_CAPS_16BIT, "DreamSourceLab", "DSCope"},
-
-       /* DreamSourceLab DSLogic Pro (before FW upload) */
-       { 0x2a0e, 0x0003, "DreamSourceLab", "DSLogic Pro", NULL,
-               "dreamsourcelab-dslogic-pro-fx2.fw",
-               DEV_CAPS_16BIT, NULL, NULL},
-       /* DreamSourceLab DSLogic Pro (after FW upload) */
-       { 0x2a0e, 0x0003, "DreamSourceLab", "DSLogic Pro", NULL,
-               "dreamsourcelab-dslogic-pro-fx2.fw",
-               DEV_CAPS_16BIT, "DreamSourceLab", "DSLogic"},
-
        /*
         * Saleae Logic
         * EE Electronics ESLA100
@@ -141,18 +113,6 @@ static const uint32_t devopts[] = {
        SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET,
 };
 
-static const uint32_t dslogic_devopts[] = {
-       SR_CONF_CONTINUOUS | SR_CONF_SET | SR_CONF_GET,
-       SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
-       SR_CONF_VOLTAGE_THRESHOLD | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
-       SR_CONF_CONN | SR_CONF_GET,
-       SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
-       SR_CONF_TRIGGER_MATCH | SR_CONF_LIST,
-       SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET,
-       SR_CONF_EXTERNAL_CLOCK | SR_CONF_GET | SR_CONF_SET,
-       SR_CONF_CLOCK_EDGE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
-};
-
 static const int32_t soft_trigger_matches[] = {
        SR_TRIGGER_ZERO,
        SR_TRIGGER_ONE,
@@ -161,21 +121,6 @@ static const int32_t soft_trigger_matches[] = {
        SR_TRIGGER_EDGE,
 };
 
-/* Names assigned to available edge slope choices. */
-static const char *const signal_edge_names[] = {
-       [DS_EDGE_RISING] = "rising",
-       [DS_EDGE_FALLING] = "falling",
-};
-
-static const struct {
-       int range;
-       gdouble low;
-       gdouble high;
-} volt_thresholds[] = {
-       { DS_VOLTAGE_RANGE_18_33_V, 0.7, 1.4 },
-       { DS_VOLTAGE_RANGE_5_V, 1.4, 3.6 },
-};
-
 static const uint64_t samplerates[] = {
        SR_KHZ(20),
        SR_KHZ(25),
@@ -195,24 +140,19 @@ static const uint64_t samplerates[] = {
        SR_MHZ(24),
 };
 
-static const uint64_t dslogic_samplerates[] = {
-       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(25),
-       SR_MHZ(50),
-       SR_MHZ(100),
-       SR_MHZ(200),
-       SR_MHZ(400),
-};
+static gboolean is_plausible(const struct libusb_device_descriptor *des)
+{
+       int i;
+
+       for (i = 0; supported_fx2[i].vid; i++) {
+               if (des->idVendor != supported_fx2[i].vid)
+                       continue;
+               if (des->idProduct == supported_fx2[i].pid)
+                       return TRUE;
+       }
+
+       return FALSE;
+}
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)
 {
@@ -271,9 +211,16 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
                libusb_get_device_descriptor( devlist[i], &des);
 
-               if ((ret = libusb_open(devlist[i], &hdl)) < 0)
+               if (!is_plausible(&des))
                        continue;
 
+               if ((ret = libusb_open(devlist[i], &hdl)) < 0) {
+                       sr_warn("Failed to open potential device with "
+                               "VID:PID %04x:%04x: %s.", des.idVendor,
+                               des.idProduct, libusb_error_name(ret));
+                       continue;
+               }
+
                if (des.iManufacturer == 0) {
                        manufacturer[0] = '\0';
                } else if ((ret = libusb_get_string_descriptor_ascii(hdl,
@@ -314,7 +261,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                                        des.idProduct == supported_fx2[j].pid &&
                                        (!supported_fx2[j].usb_manufacturer ||
                                         !strcmp(manufacturer, supported_fx2[j].usb_manufacturer)) &&
-                                       (!supported_fx2[j].usb_manufacturer ||
+                                       (!supported_fx2[j].usb_product ||
                                         !strcmp(product, supported_fx2[j].usb_product))) {
                                prof = &supported_fx2[j];
                                break;
@@ -362,26 +309,13 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
                devc = fx2lafw_dev_new();
                devc->profile = prof;
-               if ((prof->dev_caps & DEV_CAPS_16BIT) || (prof->dev_caps & DEV_CAPS_AX_ANALOG))
-                       devc->sample_wide = TRUE;
                sdi->priv = devc;
                devices = g_slist_append(devices, sdi);
 
-               if (!strcmp(prof->model, "DSLogic")
-                               || !strcmp(prof->model, "DSLogic Pro")
-                               || !strcmp(prof->model, "DSCope")) {
-                       devc->dslogic = TRUE;
-                       devc->samplerates = dslogic_samplerates;
-                       devc->num_samplerates = ARRAY_SIZE(dslogic_samplerates);
-                       has_firmware = match_manuf_prod(devlist[i], "DreamSourceLab", "DSLogic")
-                                       || match_manuf_prod(devlist[i], "DreamSourceLab", "DSCope");
-               } else {
-                       devc->dslogic = FALSE;
-                       devc->samplerates = samplerates;
-                       devc->num_samplerates = ARRAY_SIZE(samplerates);
-                       has_firmware = match_manuf_prod(devlist[i],
-                                       "sigrok", "fx2lafw");
-               }
+               devc->samplerates = samplerates;
+               devc->num_samplerates = ARRAY_SIZE(samplerates);
+               has_firmware = usb_match_manuf_prod(devlist[i],
+                               "sigrok", "fx2lafw");
 
                if (has_firmware) {
                        /* Already has the firmware, so fix the new address. */
@@ -430,7 +364,6 @@ static int dev_open(struct sr_dev_inst *sdi)
        struct sr_dev_driver *di = sdi->driver;
        struct sr_usb_dev_inst *usb;
        struct dev_context *devc;
-       const char *fpga_firmware = NULL;
        int ret;
        int64_t timediff_us, timediff_ms;
 
@@ -490,21 +423,6 @@ static int dev_open(struct sr_dev_inst *sdi)
                return SR_ERR;
        }
 
-       if (devc->dslogic) {
-               if (!strcmp(devc->profile->model, "DSLogic")) {
-                       if (devc->dslogic_voltage_threshold == DS_VOLTAGE_RANGE_18_33_V)
-                               fpga_firmware = DSLOGIC_FPGA_FIRMWARE_3V3;
-                       else
-                               fpga_firmware = DSLOGIC_FPGA_FIRMWARE_5V;
-               } else if (!strcmp(devc->profile->model, "DSLogic Pro")){
-                       fpga_firmware = DSLOGIC_PRO_FPGA_FIRMWARE;
-               } else if (!strcmp(devc->profile->model, "DSCope")) {
-                       fpga_firmware = DSCOPE_FPGA_FIRMWARE;
-               }
-
-               if ((ret = dslogic_fpga_firmware_upload(sdi, fpga_firmware)) != SR_OK)
-                       return ret;
-       }
        if (devc->cur_samplerate == 0) {
                /* Samplerate hasn't been set; default to the slowest one. */
                devc->cur_samplerate = devc->samplerates[0];
@@ -520,14 +438,13 @@ static int dev_close(struct sr_dev_inst *sdi)
        usb = sdi->conn;
 
        if (!usb->devhdl)
-               return SR_ERR;
+               return SR_ERR_BUG;
 
        sr_info("fx2lafw: 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;
-       sdi->status = SR_ST_INACTIVE;
 
        return SR_OK;
 }
@@ -537,8 +454,6 @@ static int config_get(uint32_t key, GVariant **data,
 {
        struct dev_context *devc;
        struct sr_usb_dev_inst *usb;
-       GVariant *range[2];
-       unsigned int i;
        char str[128];
 
        (void)cg;
@@ -560,16 +475,6 @@ static int config_get(uint32_t key, GVariant **data,
                snprintf(str, 128, "%d.%d", usb->bus, usb->address);
                *data = g_variant_new_string(str);
                break;
-       case SR_CONF_VOLTAGE_THRESHOLD:
-               for (i = 0; i < ARRAY_SIZE(volt_thresholds); i++) {
-                       if (volt_thresholds[i].range != devc->dslogic_voltage_threshold)
-                               continue;
-                       range[0] = g_variant_new_double(volt_thresholds[i].low);
-                       range[1] = g_variant_new_double(volt_thresholds[i].high);
-                       *data = g_variant_new_tuple(range, 2);
-                       break;
-               }
-               break;
        case SR_CONF_LIMIT_SAMPLES:
                *data = g_variant_new_uint64(devc->limit_samples);
                break;
@@ -579,18 +484,6 @@ static int config_get(uint32_t key, GVariant **data,
        case SR_CONF_CAPTURE_RATIO:
                *data = g_variant_new_uint64(devc->capture_ratio);
                break;
-       case SR_CONF_EXTERNAL_CLOCK:
-               *data = g_variant_new_boolean(devc->dslogic_external_clock);
-               break;
-       case SR_CONF_CONTINUOUS:
-               *data = g_variant_new_boolean(devc->dslogic_continuous_mode);
-               break;
-       case SR_CONF_CLOCK_EDGE:
-               i = devc->dslogic_clock_edge;
-               if (i >= ARRAY_SIZE(signal_edge_names))
-                       return SR_ERR_BUG;
-               *data = g_variant_new_string(signal_edge_names[0]);
-               break;
        default:
                return SR_ERR_NA;
        }
@@ -598,44 +491,18 @@ static int config_get(uint32_t key, GVariant **data,
        return SR_OK;
 }
 
-/*
- * Helper for mapping a string-typed configuration value to an index
- * within a table of possible values.
- */
-static int lookup_index(GVariant *value, const char *const *table, int len)
-{
-       const char *entry;
-       int i;
-
-       entry = g_variant_get_string(value, NULL);
-       if (!entry)
-               return -1;
-
-       /* Linear search is fine for very small tables. */
-       for (i = 0; i < len; i++) {
-               if (strcmp(entry, table[i]) == 0)
-                       return i;
-       }
-
-       return -1;
-}
-
 static int config_set(uint32_t key, GVariant *data,
        const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
        uint64_t arg;
        int i, ret;
-       gdouble low, high;
 
        (void)cg;
 
        if (!sdi)
                return SR_ERR_ARG;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR;
-
        devc = sdi->priv;
 
        ret = SR_OK;
@@ -659,38 +526,6 @@ static int config_set(uint32_t key, GVariant *data,
                devc->capture_ratio = g_variant_get_uint64(data);
                ret = (devc->capture_ratio > 100) ? SR_ERR : SR_OK;
                break;
-       case SR_CONF_VOLTAGE_THRESHOLD:
-               g_variant_get(data, "(dd)", &low, &high);
-               ret = SR_ERR_ARG;
-               for (i = 0; (unsigned int)i < ARRAY_SIZE(volt_thresholds); i++) {
-                       if (fabs(volt_thresholds[i].low - low) < 0.1 &&
-                           fabs(volt_thresholds[i].high - high) < 0.1) {
-                               devc->dslogic_voltage_threshold = volt_thresholds[i].range;
-                               break;
-                       }
-               }
-               if (!strcmp(devc->profile->model, "DSLogic")) {
-                       if (devc->dslogic_voltage_threshold == DS_VOLTAGE_RANGE_5_V)
-                               ret = dslogic_fpga_firmware_upload(sdi, DSLOGIC_FPGA_FIRMWARE_5V);
-                       else
-                               ret = dslogic_fpga_firmware_upload(sdi, DSLOGIC_FPGA_FIRMWARE_3V3);
-               } else if (!strcmp(devc->profile->model, "DSLogic Pro")) {
-                       ret = dslogic_fpga_firmware_upload(sdi, DSLOGIC_PRO_FPGA_FIRMWARE);
-               }
-               break;
-       case SR_CONF_EXTERNAL_CLOCK:
-               devc->dslogic_external_clock = g_variant_get_boolean(data);
-               break;
-       case SR_CONF_CONTINUOUS:
-               devc->dslogic_continuous_mode = g_variant_get_boolean(data);
-               break;
-       case SR_CONF_CLOCK_EDGE:
-               i = lookup_index(data, signal_edge_names,
-                                  ARRAY_SIZE(signal_edge_names));
-               if (i < 0)
-                       return SR_ERR_ARG;
-               devc->dslogic_clock_edge = i;
-               break;          
        default:
                ret = SR_ERR_NA;
        }
@@ -702,9 +537,8 @@ static int config_list(uint32_t key, GVariant **data,
        const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
 {
        struct dev_context *devc;
-       GVariant *gvar, *range[2];
+       GVariant *gvar;
        GVariantBuilder gvb;
-       unsigned int i;
 
        (void)cg;
 
@@ -719,29 +553,10 @@ static int config_list(uint32_t key, GVariant **data,
                                drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
                } else {
                        devc = sdi->priv;
-                       if (!devc->dslogic)
-                               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                                                                 devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
-                       else
-                               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                                                                 dslogic_devopts, ARRAY_SIZE(dslogic_devopts), sizeof(uint32_t));
+                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+                                                         devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
                }
                break;
-       case SR_CONF_VOLTAGE_THRESHOLD:
-               if (!sdi->priv)
-                       return SR_ERR_ARG;
-               devc = sdi->priv;
-               if (!devc->dslogic)
-                       return SR_ERR_NA;
-               g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
-               for (i = 0; i < ARRAY_SIZE(volt_thresholds); i++) {
-                       range[0] = g_variant_new_double(volt_thresholds[i].low);
-                       range[1] = g_variant_new_double(volt_thresholds[i].high);
-                       gvar = g_variant_new_tuple(range, 2);
-                       g_variant_builder_add_value(&gvb, gvar);
-               }
-               *data = g_variant_builder_end(&gvb);
-               break;
        case SR_CONF_SAMPLERATE:
                devc = sdi->priv;
                g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
@@ -755,10 +570,6 @@ static int config_list(uint32_t key, GVariant **data,
                                soft_trigger_matches, ARRAY_SIZE(soft_trigger_matches),
                                sizeof(int32_t));
                break;
-       case SR_CONF_CLOCK_EDGE:
-               *data = g_variant_new_strv(signal_edge_names,
-                       ARRAY_SIZE(signal_edge_names));
-               break;
        default:
                return SR_ERR_NA;
        }
@@ -766,277 +577,8 @@ static int config_list(uint32_t key, GVariant **data,
        return SR_OK;
 }
 
-static int receive_data(int fd, int revents, void *cb_data)
-{
-       struct timeval tv;
-       struct drv_context *drvc;
-
-       (void)fd;
-       (void)revents;
-
-       drvc = (struct drv_context *)cb_data;
-
-       tv.tv_sec = tv.tv_usec = 0;
-       libusb_handle_events_timeout(drvc->sr_ctx->libusb_ctx, &tv);
-
-       return TRUE;
-}
-
-static int start_transfers(const struct sr_dev_inst *sdi)
-{
-       struct dev_context *devc;
-       struct sr_usb_dev_inst *usb;
-       struct sr_trigger *trigger;
-       struct libusb_transfer *transfer;
-       unsigned int i, num_transfers;
-       int endpoint, timeout, ret;
-       unsigned char *buf;
-       size_t size;
-
-       devc = sdi->priv;
-       usb = sdi->conn;
-
-       devc->sent_samples = 0;
-       devc->acq_aborted = FALSE;
-       devc->empty_transfer_count = 0;
-
-       if ((trigger = sr_session_trigger_get(sdi->session)) && !devc->dslogic) {
-               int pre_trigger_samples = 0;
-               if (devc->limit_samples > 0)
-                       pre_trigger_samples = devc->capture_ratio * devc->limit_samples/100;
-               devc->stl = soft_trigger_logic_new(sdi, trigger, pre_trigger_samples);
-               if (!devc->stl)
-                       return SR_ERR_MALLOC;
-               devc->trigger_fired = FALSE;
-       } else
-               devc->trigger_fired = TRUE;
-
-       num_transfers = fx2lafw_get_number_of_transfers(devc);
-
-       //if (devc->dslogic)
-       //      num_transfers = dslogic_get_number_of_transfers(devc);
-
-       if (devc->dslogic) {
-               if (devc->cur_samplerate == SR_MHZ(100))
-                       num_transfers = 16;
-               else if (devc->cur_samplerate == SR_MHZ(200))
-                       num_transfers = 8;
-               else if (devc->cur_samplerate == SR_MHZ(400))
-                       num_transfers = 4;
-       }
-
-       size = fx2lafw_get_buffer_size(devc);
-       devc->submitted_transfers = 0;
-
-       devc->transfers = g_try_malloc0(sizeof(*devc->transfers) * num_transfers);
-       if (!devc->transfers) {
-               sr_err("USB transfers malloc failed.");
-               return SR_ERR_MALLOC;
-       }
-
-       timeout = fx2lafw_get_timeout(devc);
-       endpoint = devc->dslogic ? 6 : 2;
-       devc->num_transfers = num_transfers;
-       for (i = 0; i < num_transfers; i++) {
-               if (!(buf = g_try_malloc(size))) {
-                       sr_err("USB transfer buffer malloc failed.");
-                       return SR_ERR_MALLOC;
-               }
-               transfer = libusb_alloc_transfer(0);
-               libusb_fill_bulk_transfer(transfer, usb->devhdl,
-                               endpoint | LIBUSB_ENDPOINT_IN, buf, size,
-                               fx2lafw_receive_transfer, (void *)sdi, timeout);
-               sr_info("submitting transfer: %d", i);
-               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);
-                       fx2lafw_abort_acquisition(devc);
-                       return SR_ERR;
-               }
-               devc->transfers[i] = transfer;
-               devc->submitted_transfers++;
-       }
-
-       if (devc->profile->dev_caps & DEV_CAPS_AX_ANALOG)
-               devc->send_data_proc = mso_send_data_proc;
-       else
-               devc->send_data_proc = la_send_data_proc;
-
-       std_session_send_df_header(sdi);
-
-       return SR_OK;
-}
-
-static void LIBUSB_CALL dslogic_trigger_receive(struct libusb_transfer *transfer)
-{
-       const struct sr_dev_inst *sdi;
-       struct dslogic_trigger_pos *tpos;
-       struct dev_context *devc;
-
-       sdi = transfer->user_data;
-       devc = sdi->priv;
-       if (transfer->status == LIBUSB_TRANSFER_CANCELLED) {
-               sr_dbg("Trigger transfer canceled.");
-               /* Terminate session. */
-               std_session_send_df_end(sdi);
-               usb_source_remove(sdi->session, devc->ctx);
-               devc->num_transfers = 0;
-               g_free(devc->transfers);
-               if (devc->stl) {
-                       soft_trigger_logic_free(devc->stl);
-                       devc->stl = NULL;
-               }
-       } else if (transfer->status == LIBUSB_TRANSFER_COMPLETED
-                       && transfer->actual_length == sizeof(struct dslogic_trigger_pos)) {
-               tpos = (struct dslogic_trigger_pos *)transfer->buffer;
-               sr_info("tpos real_pos %d ram_saddr %d cnt %d", tpos->real_pos,
-                       tpos->ram_saddr, tpos->remain_cnt);
-               devc->trigger_pos = tpos->real_pos;
-               g_free(tpos);
-               start_transfers(sdi);
-       }
-       libusb_free_transfer(transfer);
-}
-
-static int dslogic_trigger_request(const struct sr_dev_inst *sdi)
-{
-       struct sr_usb_dev_inst *usb;
-       struct libusb_transfer *transfer;
-       struct dslogic_trigger_pos *tpos;
-       struct dev_context *devc;
-       int ret;
-
-       usb = sdi->conn;
-       devc = sdi->priv;
-
-       if ((ret = dslogic_stop_acquisition(sdi)) != SR_OK)
-               return ret;
-
-       if ((ret = dslogic_fpga_configure(sdi)) != SR_OK)
-               return ret;
-
-       /* If this is a DSLogic Pro, set the voltage threshold. */
-       if (!strcmp(devc->profile->model, "DSLogic Pro")){
-               if (devc->dslogic_voltage_threshold == DS_VOLTAGE_RANGE_18_33_V) {
-                       dslogic_set_vth(sdi, 1.4);
-               } else {
-                       dslogic_set_vth(sdi, 3.3);
-               }
-       }
-
-       if ((ret = dslogic_start_acquisition(sdi)) != SR_OK)
-               return ret;
-
-       sr_dbg("Getting trigger.");
-       tpos = g_malloc(sizeof(struct dslogic_trigger_pos));
-       transfer = libusb_alloc_transfer(0);
-       libusb_fill_bulk_transfer(transfer, usb->devhdl, 6 | LIBUSB_ENDPOINT_IN,
-                       (unsigned char *)tpos, sizeof(struct dslogic_trigger_pos),
-                       dslogic_trigger_receive, (void *)sdi, 0);
-       if ((ret = libusb_submit_transfer(transfer)) < 0) {
-               sr_err("Failed to request trigger: %s.", libusb_error_name(ret));
-               libusb_free_transfer(transfer);
-               g_free(tpos);
-               return SR_ERR;
-       }
-
-       devc->transfers = g_try_malloc0(sizeof(*devc->transfers));
-       if (!devc->transfers) {
-               sr_err("USB trigger_pos transfer malloc failed.");
-               return SR_ERR_MALLOC;
-       }
-       devc->num_transfers = 1;
-       devc->submitted_transfers++;
-       devc->transfers[0] = transfer;
-
-       return ret;
-}
-
-static int configure_channels(const struct sr_dev_inst *sdi)
-{
-       struct dev_context *devc;
-       const GSList *l;
-       int p;
-       struct sr_channel *ch;
-
-       devc = sdi->priv;
-
-       g_slist_free(devc->enabled_analog_channels);
-       devc->enabled_analog_channels = NULL;
-       memset(devc->ch_enabled, 0, sizeof(devc->ch_enabled));
-
-       for (l = sdi->channels, p = 0; l; l = l->next, p++) {
-               ch = l->data;
-               if ((p <= NUM_CHANNELS) && (ch->type == SR_CHANNEL_ANALOG)) {
-                       devc->ch_enabled[p] = ch->enabled;
-                       devc->enabled_analog_channels =
-                           g_slist_append(devc->enabled_analog_channels, ch);
-               }
-       }
-
-       return SR_OK;
-}
-
-static int dev_acquisition_start(const struct sr_dev_inst *sdi)
-{
-       struct sr_dev_driver *di;
-       struct drv_context *drvc;
-       struct dev_context *devc;
-       int timeout, ret;
-       size_t size;
-
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
-       di = sdi->driver;
-       drvc = di->context;
-       devc = sdi->priv;
-
-       devc->ctx = drvc->sr_ctx;
-       devc->sent_samples = 0;
-       devc->empty_transfer_count = 0;
-       devc->acq_aborted = FALSE;
-
-       if (configure_channels(sdi) != SR_OK) {
-               sr_err("Failed to configure channels.");
-               return SR_ERR;
-       }
-
-       timeout = fx2lafw_get_timeout(devc);
-       usb_source_add(sdi->session, devc->ctx, timeout, receive_data, drvc);
-
-       if (devc->dslogic) {
-               dslogic_trigger_request(sdi);
-       } else {
-               size = fx2lafw_get_buffer_size(devc);
-               /* Prepare for analog sampling. */
-               if (devc->profile->dev_caps & DEV_CAPS_AX_ANALOG) {
-                       /* We need a buffer half the size of a transfer. */
-                       devc->logic_buffer = g_try_malloc(size / 2);
-                       devc->analog_buffer = g_try_malloc(
-                               sizeof(float) * size / 2);
-               }
-               start_transfers(sdi);
-               if ((ret = fx2lafw_command_start_acquisition(sdi)) != SR_OK) {
-                       fx2lafw_abort_acquisition(devc);
-                       return ret;
-               }
-       }
-
-       return SR_OK;
-}
-
 static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
-       struct dev_context *devc;
-
-       devc = sdi->priv;
-
-       if (devc->dslogic)
-               dslogic_stop_acquisition(sdi);
-
        fx2lafw_abort_acquisition(sdi->priv);
 
        return SR_OK;
@@ -1056,7 +598,7 @@ static struct sr_dev_driver fx2lafw_driver_info = {
        .config_list = config_list,
        .dev_open = dev_open,
        .dev_close = dev_close,
-       .dev_acquisition_start = dev_acquisition_start,
+       .dev_acquisition_start = fx2lafw_start_acquisition,
        .dev_acquisition_stop = dev_acquisition_stop,
        .context = NULL,
 };