X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Ffx2lafw%2Fapi.c;h=c3f3ed4b5e89406e3f6d207a9850fb9ce4441a81;hb=2c24077466a299ead689c90f01f55f6d86c7386b;hp=5cb36330461ac6e7fdef01675ec87a0b00739adc;hpb=c442ffda0fc6fa9bc3c5397a21ef1d04f01a64a1;p=libsigrok.git diff --git a/src/hardware/fx2lafw/api.c b/src/hardware/fx2lafw/api.c index 5cb36330..c3f3ed4b 100644 --- a/src/hardware/fx2lafw/api.c +++ b/src/hardware/fx2lafw/api.c @@ -18,6 +18,7 @@ * along with this program. If not, see . */ +#include #include "protocol.h" #include "dslogic.h" @@ -28,48 +29,48 @@ static const struct fx2lafw_profile supported_fx2[] = { * ARMFLY AX-Pro */ { 0x08a9, 0x0014, "CWAV", "USBee AX", NULL, - FIRMWARE_DIR "/fx2lafw-cwav-usbeeax.fw", + "fx2lafw-cwav-usbeeax.fw", 0, NULL, NULL}, /* * CWAV USBee DX * XZL-Studio DX */ { 0x08a9, 0x0015, "CWAV", "USBee DX", NULL, - FIRMWARE_DIR "/fx2lafw-cwav-usbeedx.fw", + "fx2lafw-cwav-usbeedx.fw", DEV_CAPS_16BIT, NULL, NULL }, /* * CWAV USBee SX */ { 0x08a9, 0x0009, "CWAV", "USBee SX", NULL, - FIRMWARE_DIR "/fx2lafw-cwav-usbeesx.fw", + "fx2lafw-cwav-usbeesx.fw", 0, NULL, NULL}, /* DreamSourceLab DSLogic (before FW upload) */ { 0x2a0e, 0x0001, "DreamSourceLab", "DSLogic", NULL, - FIRMWARE_DIR "/dreamsourcelab-dslogic-fx2.fw", + "dreamsourcelab-dslogic-fx2.fw", DEV_CAPS_16BIT, NULL, NULL}, /* DreamSourceLab DSLogic (after FW upload) */ { 0x2a0e, 0x0001, "DreamSourceLab", "DSLogic", NULL, - FIRMWARE_DIR "/dreamsourcelab-dslogic-fx2.fw", + "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", + "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", + "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", + "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", + "dreamsourcelab-dslogic-pro-fx2.fw", DEV_CAPS_16BIT, "DreamSourceLab", "DSLogic"}, /* @@ -79,7 +80,7 @@ static const struct fx2lafw_profile supported_fx2[] = { * Robomotic BugLogic 3 */ { 0x0925, 0x3881, "Saleae", "Logic", NULL, - FIRMWARE_DIR "/fx2lafw-saleae-logic.fw", + "fx2lafw-saleae-logic.fw", 0, NULL, NULL}, /* @@ -88,14 +89,28 @@ static const struct fx2lafw_profile supported_fx2[] = { * Braintechnology USB Interface V2.x */ { 0x04B4, 0x8613, "Cypress", "FX2", NULL, - FIRMWARE_DIR "/fx2lafw-cypress-fx2.fw", + "fx2lafw-cypress-fx2.fw", DEV_CAPS_16BIT, NULL, NULL }, /* * Braintechnology USB-LPS */ { 0x16d0, 0x0498, "Braintechnology", "USB-LPS", NULL, - FIRMWARE_DIR "/fx2lafw-braintechnology-usb-lps.fw", + "fx2lafw-braintechnology-usb-lps.fw", + DEV_CAPS_16BIT, NULL, NULL }, + + /* + * sigrok FX2 based 8-channel logic analyzer + */ + { 0x1d50, 0x608c, "sigrok", "FX2 LA (8ch)", NULL, + "fx2lafw-sigrok-fx2-8ch.fw", + 0, NULL, NULL}, + + /* + * sigrok FX2 based 16-channel logic analyzer + */ + { 0x1d50, 0x608d, "sigrok", "FX2 LA (16ch)", NULL, + "fx2lafw-sigrok-fx2-16ch.fw", DEV_CAPS_16BIT, NULL, NULL }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 } @@ -227,11 +242,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) continue; } - if ((ret = libusb_get_device_descriptor( devlist[i], &des)) != 0) { - sr_warn("Failed to get device descriptor: %s.", - libusb_error_name(ret)); - continue; - } + libusb_get_device_descriptor( devlist[i], &des); if ((ret = libusb_open(devlist[i], &hdl)) < 0) continue; @@ -333,8 +344,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) sdi->conn = sr_usb_dev_inst_new(libusb_get_bus_number(devlist[i]), libusb_get_device_address(devlist[i]), NULL); } else { - if (ezusb_upload_firmware(devlist[i], USB_CONFIGURATION, - prof->firmware) == SR_OK) + if (ezusb_upload_firmware(drvc->sr_ctx, devlist[i], + USB_CONFIGURATION, prof->firmware) == SR_OK) /* Store when this device's FW was updated. */ devc->fw_updated = g_get_monotonic_time(); else @@ -363,7 +374,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; + const char *fpga_firmware = NULL; int ret; int64_t timediff_us, timediff_ms; @@ -556,11 +567,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd 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; + ret = (devc->capture_ratio > 100) ? SR_ERR : SR_OK; break; default: ret = SR_ERR_NA; @@ -658,8 +665,6 @@ static int start_transfers(const struct sr_dev_inst *sdi) } else devc->trigger_fired = TRUE; - timeout = fx2lafw_get_timeout(devc); - num_transfers = fx2lafw_get_number_of_transfers(devc); size = fx2lafw_get_buffer_size(devc); devc->submitted_transfers = 0;