X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffx2lafw%2Fapi.c;h=4348e680825af8c1f9be71ad8f344bd0a3607d2a;hb=41812aca436805b0614f2a8f31cf2f8ce494aea0;hp=5e1f66432298363178399e9031a940beb3ed4a83;hpb=1a8639164e4e44a43fe1558e30823606f7b607b3;p=libsigrok.git diff --git a/src/hardware/fx2lafw/api.c b/src/hardware/fx2lafw/api.c index 5e1f6643..4348e680 100644 --- a/src/hardware/fx2lafw/api.c +++ b/src/hardware/fx2lafw/api.c @@ -45,20 +45,33 @@ static const struct fx2lafw_profile supported_fx2[] = { FIRMWARE_DIR "/fx2lafw-cwav-usbeesx.fw", 0, NULL, NULL}, - /* - * DreamSourceLab DSLogic (before FW upload) - */ + /* DreamSourceLab DSLogic (before FW upload) */ { 0x2a0e, 0x0001, "DreamSourceLab", "DSLogic", NULL, FIRMWARE_DIR "/dreamsourcelab-dslogic-fx2.fw", DEV_CAPS_16BIT, NULL, NULL}, - - /* - * DreamSourceLab DSLogic (after FW upload) - */ + /* DreamSourceLab DSLogic (after FW upload) */ { 0x2a0e, 0x0001, "DreamSourceLab", "DSLogic", NULL, FIRMWARE_DIR "/dreamsourcelab-dslogic-fx2.fw", DEV_CAPS_16BIT, "DreamSourceLab", "DSLogic"}, + /* DreamSourceLab DSCope (before FW upload) */ + { 0x2a0e, 0x0002, "DreamSourceLab", "DSCope", NULL, + FIRMWARE_DIR "/dreamsourcelab-dscope-fx2.fw", + DEV_CAPS_16BIT, NULL, NULL}, + /* DreamSourceLab DSCope (after FW upload) */ + { 0x2a0e, 0x0002, "DreamSourceLab", "DSCope", NULL, + FIRMWARE_DIR "/dreamsourcelab-dscope-fx2.fw", + DEV_CAPS_16BIT, "DreamSourceLab", "DSCope"}, + + /* DreamSourceLab DSLogic Pro (before FW upload) */ + { 0x2a0e, 0x0003, "DreamSourceLab", "DSLogic Pro", NULL, + FIRMWARE_DIR "/dreamsourcelab-dslogic-pro-fx2.fw", + DEV_CAPS_16BIT, NULL, NULL}, + /* DreamSourceLab DSLogic Pro (after FW upload) */ + { 0x2a0e, 0x0003, "DreamSourceLab", "DSLogic Pro", NULL, + FIRMWARE_DIR "/dreamsourcelab-dslogic-pro-fx2.fw", + DEV_CAPS_16BIT, "DreamSourceLab", "DSLogic"}, + /* * Saleae Logic * EE Electronics ESLA100 @@ -106,9 +119,8 @@ static const uint32_t devopts[] = { }; static const char *channel_names[] = { - "0", "1", "2", "3", "4", "5", "6", "7", - "8", "9", "10", "11", "12", "13", "14", "15", - NULL, + "0", "1", "2", "3", "4", "5", "6", "7", + "8", "9", "10", "11", "12", "13", "14", "15", }; static const int32_t soft_trigger_matches[] = { @@ -181,7 +193,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) const char *conn; char manufacturer[64], product[64], serial_num[64], connection_id[64]; - drvc = di->priv; + drvc = di->context; conn = NULL; for (l = options; l; l = l->next) { @@ -297,18 +309,20 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) drvc->instances = g_slist_append(drvc->instances, sdi); devices = g_slist_append(devices, sdi); - if (strcmp(prof->model, "DSLogic")) { + 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"); - } else { - devc->dslogic = TRUE; - devc->samplerates = dslogic_samplerates; - devc->num_samplerates = ARRAY_SIZE(dslogic_samplerates); - has_firmware = match_manuf_prod(devlist[i], - "DreamSourceLab", "DSLogic"); } if (has_firmware) { @@ -341,7 +355,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) static GSList *dev_list(const struct sr_dev_driver *di) { - return ((struct drv_context *)(di->priv))->instances; + return ((struct drv_context *)(di->context))->instances; } static int dev_open(struct sr_dev_inst *sdi) @@ -349,6 +363,7 @@ 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; + char *fpga_firmware = NULL; int ret; int64_t timediff_us, timediff_ms; @@ -409,8 +424,16 @@ static int dev_open(struct sr_dev_inst *sdi) } if (devc->dslogic) { + if (!strcmp(devc->profile->model, "DSLogic")) { + fpga_firmware = DSLOGIC_FPGA_FIRMWARE; + } 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, - DSLOGIC_FPGA_FIRMWARE)) != SR_OK) + fpga_firmware)) != SR_OK) return ret; } @@ -427,7 +450,7 @@ static int dev_close(struct sr_dev_inst *sdi) struct sr_usb_dev_inst *usb; usb = sdi->conn; - if (usb->devhdl == NULL) + if (!usb->devhdl) return SR_ERR; sr_info("fx2lafw: Closing device on %d.%d (logical) / %s (physical) interface %d.", @@ -445,7 +468,7 @@ static int cleanup(const struct sr_dev_driver *di) int ret; struct drv_context *drvc; - if (!(drvc = di->priv)) + if (!(drvc = di->context)) return SR_OK; ret = std_dev_clear(di, NULL); @@ -502,8 +525,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd { struct dev_context *devc; uint64_t arg; - unsigned int i; - int ret; + int i, ret; (void)cg; @@ -518,30 +540,30 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd ret = SR_OK; switch (key) { - case SR_CONF_SAMPLERATE: - arg = g_variant_get_uint64(data); - for (i = 0; i < ARRAY_SIZE(samplerates); i++) { - if (samplerates[i] == arg) { - devc->cur_samplerate = arg; - break; - } + case SR_CONF_SAMPLERATE: + arg = g_variant_get_uint64(data); + for (i = 0; i < devc->num_samplerates; i++) { + if (devc->samplerates[i] == arg) { + devc->cur_samplerate = arg; + break; } - if (i == ARRAY_SIZE(samplerates)) - ret = SR_ERR_ARG; - break; - case SR_CONF_LIMIT_SAMPLES: - devc->limit_samples = g_variant_get_uint64(data); - break; - case SR_CONF_CAPTURE_RATIO: - devc->capture_ratio = g_variant_get_uint64(data); - if (devc->capture_ratio > 100) { - devc->capture_ratio = 0; - ret = SR_ERR; - } else - ret = SR_OK; - break; - default: - ret = SR_ERR_NA; + } + if (i == devc->num_samplerates) + ret = SR_ERR_ARG; + break; + case SR_CONF_LIMIT_SAMPLES: + devc->limit_samples = g_variant_get_uint64(data); + break; + case SR_CONF_CAPTURE_RATIO: + devc->capture_ratio = g_variant_get_uint64(data); + if (devc->capture_ratio > 100) { + devc->capture_ratio = 0; + ret = SR_ERR; + } else + ret = SR_OK; + break; + default: + ret = SR_ERR_NA; } return ret; @@ -630,7 +652,7 @@ static int start_transfers(const struct sr_dev_inst *sdi) 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 == NULL) + if (!devc->stl) return SR_ERR_MALLOC; devc->trigger_fired = FALSE; } else @@ -678,7 +700,7 @@ static int start_transfers(const struct sr_dev_inst *sdi) return SR_OK; } -static void dslogic_trigger_receive(struct libusb_transfer *transfer) +static void LIBUSB_CALL dslogic_trigger_receive(struct libusb_transfer *transfer) { const struct sr_dev_inst *sdi; struct dslogic_trigger_pos *tpos; @@ -742,7 +764,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) return SR_ERR_DEV_CLOSED; di = sdi->driver; - drvc = di->priv; + drvc = di->context; devc = sdi->priv; devc->ctx = drvc->sr_ctx; @@ -758,9 +780,11 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data) dslogic_trigger_request(sdi); } else { - if ((ret = fx2lafw_command_start_acquisition(sdi)) != SR_OK) - return ret; start_transfers(sdi); + if ((ret = fx2lafw_command_start_acquisition(sdi)) != SR_OK) { + fx2lafw_abort_acquisition(devc); + return ret; + } } return SR_OK; @@ -791,5 +815,5 @@ SR_PRIV struct sr_dev_driver fx2lafw_driver_info = { .dev_close = dev_close, .dev_acquisition_start = dev_acquisition_start, .dev_acquisition_stop = dev_acquisition_stop, - .priv = NULL, + .context = NULL, };