X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fftdi-la%2Fapi.c;h=432f566f84ed71a00f38b077e065a0c28b926de7;hb=HEAD;hp=c59ff9ad493e0572ef950fa918eb9bc185fcd268;hpb=ca314e060f653e6a0b5ec0f58914bac4d426217f;p=libsigrok.git diff --git a/src/hardware/ftdi-la/api.c b/src/hardware/ftdi-la/api.c index c59ff9ad..2e7e59f4 100644 --- a/src/hardware/ftdi-la/api.c +++ b/src/hardware/ftdi-la/api.c @@ -50,44 +50,69 @@ static const struct ftdi_chip_desc ft2232h_desc = { .product = 0x6010, .samplerate_div = 20, .channel_names = { - "ADBUS0", - "ADBUS1", - "ADBUS2", - "ADBUS3", - "ADBUS4", - "ADBUS5", - "ADBUS6", - "ADBUS7", + "ADBUS0", "ADBUS1", "ADBUS2", "ADBUS3", + "ADBUS4", "ADBUS5", "ADBUS6", "ADBUS7", /* TODO: BDBUS[0..7] channels. */ NULL } }; +static const struct ftdi_chip_desc ft2232h_tumpa_desc = { + .vendor = 0x0403, + .product = 0x8a98, + .samplerate_div = 20, + /* 20 pin JTAG header */ + .channel_names = { + "TCK", "TDI", "TDO", "TMS", "RST", "nTRST", "DBGRQ", "RTCK", + NULL + } +}; + +static const struct ftdi_chip_desc ft4232h_desc = { + .vendor = 0x0403, + .product = 0x6011, + .samplerate_div = 20, + .channel_names = { + "ADBUS0", "ADBUS1", "ADBUS2", "ADBUS3", "ADBUS4", "ADBUS5", "ADBUS6", "ADBUS7", + /* TODO: BDBUS[0..7], CDBUS[0..7], DDBUS[0..7] channels. */ + NULL + } +}; + static const struct ftdi_chip_desc ft232r_desc = { .vendor = 0x0403, .product = 0x6001, .samplerate_div = 30, .channel_names = { - "TXD", - "RXD", - "RTS#", - "CTS#", - "DTR#", - "DSR#", - "DCD#", - "RI#", + "TXD", "RXD", "RTS#", "CTS#", "DTR#", "DSR#", "DCD#", "RI#", + NULL + } +}; + +static const struct ftdi_chip_desc ft232h_desc = { + .vendor = 0x0403, + .product = 0x6014, + .samplerate_div = 30, + .channel_names = { + "ADBUS0", "ADBUS1", "ADBUS2", "ADBUS3", "ADBUS4", "ADBUS5", "ADBUS6", "ADBUS7", NULL } }; static const struct ftdi_chip_desc *chip_descs[] = { &ft2232h_desc, + &ft2232h_tumpa_desc, + &ft4232h_desc, &ft232r_desc, + &ft232h_desc, + NULL, }; static void scan_device(struct ftdi_context *ftdic, struct libusb_device *dev, GSList **devices) { + static const int usb_str_maxlen = 32; + struct libusb_device_descriptor usb_desc; const struct ftdi_chip_desc *desc; struct dev_context *devc; @@ -100,13 +125,15 @@ static void scan_device(struct ftdi_context *ftdic, desc = NULL; for (unsigned long i = 0; i < ARRAY_SIZE(chip_descs); i++) { desc = chip_descs[i]; + if (!desc) + break; if (desc->vendor == usb_desc.idVendor && desc->product == usb_desc.idProduct) break; } if (!desc) { - sr_spew("Unsupported FTDI device 0x%4x:0x%4x.", + sr_spew("Unsupported FTDI device 0x%04x:0x%04x.", usb_desc.idVendor, usb_desc.idProduct); return; } @@ -118,14 +145,42 @@ static void scan_device(struct ftdi_context *ftdic, devc->desc = desc; - vendor = g_malloc(32); - model = g_malloc(32); - serial_num = g_malloc(32); - rv = ftdi_usb_get_strings(ftdic, dev, vendor, 32, - model, 32, serial_num, 32); + vendor = g_malloc(usb_str_maxlen); + model = g_malloc(usb_str_maxlen); + serial_num = g_malloc(usb_str_maxlen); + rv = ftdi_usb_get_strings(ftdic, dev, vendor, usb_str_maxlen, + model, usb_str_maxlen, serial_num, usb_str_maxlen); switch (rv) { case 0: break; + /* ftdi_usb_get_strings() fails on first miss, hence fall through. */ + case -7: + sr_dbg("The device lacks a manufacturer descriptor."); + g_snprintf(vendor, usb_str_maxlen, "Generic"); + /* FALLTHROUGH */ + case -8: + sr_dbg("The device lacks a product descriptor."); + switch (usb_desc.idProduct) { + case 0x6001: + g_snprintf(model, usb_str_maxlen, "FT232R"); + break; + case 0x6010: + g_snprintf(model, usb_str_maxlen, "FT2232H"); + break; + case 0x6011: + g_snprintf(model, usb_str_maxlen, "FT4232H"); + break; + case 0x6014: + g_snprintf(model, usb_str_maxlen, "FT232H"); + break; + case 0x8a98: + g_snprintf(model, usb_str_maxlen, "FT2232H-TUMPA"); + break; + default: + g_snprintf(model, usb_str_maxlen, "Unknown"); + break; + } + /* FALLTHROUGH */ case -9: sr_dbg("The device lacks a serial number."); g_free(serial_num); @@ -270,7 +325,7 @@ static int dev_open(struct sr_dev_inst *sdi) goto err_ftdi_free; } - ret = ftdi_usb_purge_buffers(devc->ftdic); + ret = PURGE_FTDI_BOTH(devc->ftdic); if (ret < 0) { sr_err("Failed to purge FTDI RX/TX buffers (%d): %s.", ret, ftdi_get_error_string(devc->ftdic)); @@ -323,7 +378,6 @@ static int config_get(uint32_t key, GVariant **data, { struct dev_context *devc; struct sr_usb_dev_inst *usb; - char str[128]; (void)cg; @@ -337,8 +391,7 @@ static int config_get(uint32_t key, GVariant **data, if (!sdi || !sdi->conn) return SR_ERR_ARG; usb = sdi->conn; - snprintf(str, 128, "%d.%d", usb->bus, usb->address); - *data = g_variant_new_string(str); + *data = g_variant_new_printf("%d.%d", usb->bus, usb->address); break; default: return SR_ERR_NA; @@ -361,10 +414,9 @@ static int config_set(uint32_t key, GVariant *data, case SR_CONF_LIMIT_MSEC: value = g_variant_get_uint64(data); /* TODO: Implement. */ + (void)value; return SR_ERR_NA; case SR_CONF_LIMIT_SAMPLES: - if (g_variant_get_uint64(data) == 0) - return SR_ERR_ARG; devc->limit_samples = g_variant_get_uint64(data); break; case SR_CONF_SAMPLERATE: @@ -383,19 +435,12 @@ static int config_set(uint32_t key, GVariant *data, static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { - GVariant *gvar; - GVariantBuilder gvb; - switch (key) { case SR_CONF_SCAN_OPTIONS: case SR_CONF_DEVICE_OPTIONS: return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts); case SR_CONF_SAMPLERATE: - g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}")); - gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), - samplerates, ARRAY_SIZE(samplerates), sizeof(uint64_t)); - g_variant_builder_add(&gvb, "{sv}", "samplerate-steps", gvar); - *data = g_variant_builder_end(&gvb); + *data = std_gvar_samplerates_steps(ARRAY_AND_SIZE(samplerates)); break; default: return SR_ERR_NA;