This is an automated email from Gerrit. "zapb <[email protected]>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9591
-- gerrit commit 39e1e8d55dc3d315e156040ee90e947096888c16 Author: Marc Schink <[email protected]> Date: Thu Apr 23 16:22:13 2026 +0200 adapter/ftdi: Delegate USB VID/PID parsing to adapter core Use the USB VID/PIDs provided by the adapter core instead of parsing them in the driver code. Keep the legacy 'ftdi_vid_pid' command for backwards compatibility, but mark it as deprecated. Change-Id: Ieb65bc3a76bff3e681325958c0486217a629bfc4 Signed-off-by: Marc Schink <[email protected]> diff --git a/doc/openocd.texi b/doc/openocd.texi index d6225876e6..e7f02c4123 100644 --- a/doc/openocd.texi +++ b/doc/openocd.texi @@ -2761,14 +2761,6 @@ signal. The following output buffer configurations are supported: These interfaces have several commands, used to configure the driver before initializing the JTAG scan chain: -@deffn {Config Command} {ftdi vid_pid} [vid pid]+ -The vendor ID and product ID of the adapter. Up to eight -[@var{vid}, @var{pid}] pairs may be given, e.g. -@example -ftdi vid_pid 0x0403 0xcff8 0x15ba 0x0003 -@end example -@end deffn - @deffn {Config Command} {ftdi device_desc} description Provides the USB device description (the @emph{iProduct string}) of the adapter. If not specified, the device description is ignored diff --git a/src/jtag/drivers/ftdi.c b/src/jtag/drivers/ftdi.c index c57972ccef..9f32c2ab57 100644 --- a/src/jtag/drivers/ftdi.c +++ b/src/jtag/drivers/ftdi.c @@ -128,11 +128,6 @@ static bool oscan1_mode; static bool jscan3_mode; #endif -#define MAX_USB_IDS 8 -/* vid = pid = 0 marks the end of the list */ -static uint16_t ftdi_vid[MAX_USB_IDS + 1] = { 0 }; -static uint16_t ftdi_pid[MAX_USB_IDS + 1] = { 0 }; - static struct mpsse_ctx *mpsse_ctx; struct signal { @@ -734,13 +729,14 @@ static int ftdi_initialize(void) else LOG_DEBUG("ftdi interface using shortest path jtag state transitions"); - if (!ftdi_vid[0] && !ftdi_pid[0]) { - LOG_ERROR("Please specify ftdi vid_pid"); + if (!adapter_usb_get_vids()[0] && !adapter_usb_get_pids()[0]) { + LOG_ERROR("Please specify 'adapter usb vid_pid'"); return ERROR_JTAG_INIT_FAILED; } - mpsse_ctx = mpsse_open(ftdi_vid, ftdi_pid, ftdi_device_desc, - adapter_get_required_serial(), adapter_usb_get_location(), ftdi_channel); + mpsse_ctx = mpsse_open(adapter_usb_get_vids(), adapter_usb_get_pids(), + ftdi_device_desc, adapter_get_required_serial(), + adapter_usb_get_location(), ftdi_channel); if (!mpsse_ctx) return ERROR_JTAG_INIT_FAILED; @@ -1240,36 +1236,6 @@ COMMAND_HANDLER(ftdi_handle_get_signal_command) return ERROR_OK; } -COMMAND_HANDLER(ftdi_handle_vid_pid_command) -{ - if (CMD_ARGC > MAX_USB_IDS * 2) { - LOG_WARNING("ignoring extra IDs in ftdi vid_pid " - "(maximum is %d pairs)", MAX_USB_IDS); - CMD_ARGC = MAX_USB_IDS * 2; - } - if (CMD_ARGC < 2 || (CMD_ARGC & 1)) { - LOG_WARNING("incomplete ftdi vid_pid configuration directive"); - if (CMD_ARGC < 2) - return ERROR_COMMAND_SYNTAX_ERROR; - /* remove the incomplete trailing id */ - CMD_ARGC -= 1; - } - - unsigned int i; - for (i = 0; i < CMD_ARGC; i += 2) { - COMMAND_PARSE_NUMBER(u16, CMD_ARGV[i], ftdi_vid[i >> 1]); - COMMAND_PARSE_NUMBER(u16, CMD_ARGV[i + 1], ftdi_pid[i >> 1]); - } - - /* - * Explicitly terminate, in case there are multiples instances of - * ftdi vid_pid. - */ - ftdi_vid[i >> 1] = ftdi_pid[i >> 1] = 0; - - return ERROR_OK; -} - COMMAND_HANDLER(ftdi_handle_tdo_sample_edge_command) { const struct nvp *n; @@ -1364,13 +1330,6 @@ static const struct command_registration ftdi_subcommand_handlers[] = { .help = "read the value of a layout-specific signal", .usage = "name", }, - { - .name = "vid_pid", - .handler = &ftdi_handle_vid_pid_command, - .mode = COMMAND_CONFIG, - .help = "the vendor ID and product ID of the FTDI device", - .usage = "(vid pid)*", - }, { .name = "tdo_sample_edge", .handler = &ftdi_handle_tdo_sample_edge_command, diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl index 441f2cccb1..03a01e6a2b 100644 --- a/src/jtag/startup.tcl +++ b/src/jtag/startup.tcl @@ -313,8 +313,8 @@ proc ftdi_get_signal args { lappend _telnet_autocomplete_skip ftdi_vid_pid proc ftdi_vid_pid args { - echo "DEPRECATED! use 'ftdi vid_pid' not 'ftdi_vid_pid'" - eval ftdi vid_pid $args + echo "DEPRECATED! use 'adapter usb vid_pid' not 'ftdi_vid_pid'" + eval adapter usb vid_pid $args } lappend _telnet_autocomplete_skip ftdi_tdo_sample_edge diff --git a/tcl/board/bemicro_cycloneiii.cfg b/tcl/board/bemicro_cycloneiii.cfg index 591a070478..0ae75693b6 100644 --- a/tcl/board/bemicro_cycloneiii.cfg +++ b/tcl/board/bemicro_cycloneiii.cfg @@ -6,7 +6,7 @@ adapter driver ftdi ftdi channel 0 ftdi layout_init 0x0008 0x008b -ftdi vid_pid 0x0403 0xa4a0 +adapter usb vid_pid 0x0403 0xa4a0 reset_config none transport select jtag diff --git a/tcl/board/calao-usb-a9260.cfg b/tcl/board/calao-usb-a9260.cfg index 52fede0fa5..26aa535eea 100644 --- a/tcl/board/calao-usb-a9260.cfg +++ b/tcl/board/calao-usb-a9260.cfg @@ -4,7 +4,7 @@ adapter driver ftdi ftdi device_desc "USB-A9260" -ftdi vid_pid 0x0403 0x6001 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6001 0x0403 0x6010 ftdi layout_init 0x0c08 0x0f1b ftdi layout_signal nTRST -data 0x0100 -noe 0x0400 ftdi layout_signal nSRST -data 0x0200 -noe 0x0800 diff --git a/tcl/board/calao-usb-a9g20-c01.cfg b/tcl/board/calao-usb-a9g20-c01.cfg index d2017864a9..49d368d8ad 100644 --- a/tcl/board/calao-usb-a9g20-c01.cfg +++ b/tcl/board/calao-usb-a9g20-c01.cfg @@ -5,7 +5,7 @@ adapter driver ftdi ftdi device_desc "USB-A9G20" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi layout_init 0x0c08 0x0f1b ftdi layout_signal nTRST -data 0x0100 -noe 0x0400 ftdi layout_signal nSRST -data 0x0200 -noe 0x0800 diff --git a/tcl/board/certuspro_evaluation.cfg b/tcl/board/certuspro_evaluation.cfg index ba2f17c221..b46695b543 100644 --- a/tcl/board/certuspro_evaluation.cfg +++ b/tcl/board/certuspro_evaluation.cfg @@ -3,7 +3,7 @@ # https://www.latticesemi.com/products/developmentboardsandkits/certuspro-nx-versa-board adapter driver ftdi -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi channel 0 ftdi layout_init 0x0008 0x008b diff --git a/tcl/board/digilent_analog_discovery.cfg b/tcl/board/digilent_analog_discovery.cfg index 1bc239b632..fcad504969 100644 --- a/tcl/board/digilent_analog_discovery.cfg +++ b/tcl/board/digilent_analog_discovery.cfg @@ -11,7 +11,7 @@ adapter driver ftdi ftdi device_desc "Digilent USB Device" -ftdi vid_pid 0x0403 0x6014 +adapter usb vid_pid 0x0403 0x6014 ftdi layout_init 0x8008 0x800b diff --git a/tcl/board/digilent_anvyl.cfg b/tcl/board/digilent_anvyl.cfg index e820028779..5982ffe78a 100644 --- a/tcl/board/digilent_anvyl.cfg +++ b/tcl/board/digilent_anvyl.cfg @@ -8,7 +8,7 @@ adapter driver ftdi adapter speed 30000 ftdi device_desc "Digilent USB Device" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 # channel 0 is the JTAG channel # channel 1 is a user serial channel to pins on the FPGA diff --git a/tcl/board/digilent_cmod_s7.cfg b/tcl/board/digilent_cmod_s7.cfg index b975f9d370..9d94545953 100644 --- a/tcl/board/digilent_cmod_s7.cfg +++ b/tcl/board/digilent_cmod_s7.cfg @@ -7,7 +7,7 @@ adapter driver ftdi ftdi channel 0 ftdi layout_init 0x0008 0x008b -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 reset_config none transport select jtag diff --git a/tcl/board/digilent_nexys_video.cfg b/tcl/board/digilent_nexys_video.cfg index b60ec912fc..50e5292472 100644 --- a/tcl/board/digilent_nexys_video.cfg +++ b/tcl/board/digilent_nexys_video.cfg @@ -7,7 +7,7 @@ adapter driver ftdi adapter speed 30000 ftdi device_desc "Digilent USB Device" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 # channel 0 is dedicated for Digilent's DPTI Interface # channel 1 is used for JTAG diff --git a/tcl/board/digilent_zybo.cfg b/tcl/board/digilent_zybo.cfg index 8573399f84..ad27978612 100644 --- a/tcl/board/digilent_zybo.cfg +++ b/tcl/board/digilent_zybo.cfg @@ -10,7 +10,7 @@ adapter driver ftdi ftdi channel 0 #ftdi_device_desc "Digilent Adept USB Device" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi layout_init 0x3088 0x1f8b ftdi layout_signal nSRST -data 0x3000 -oe 0x1000 ftdi layout_signal LED -data 0x0010 diff --git a/tcl/board/easydevkits/esp32-wrover-e-ftdi-jtag-devkit.cfg b/tcl/board/easydevkits/esp32-wrover-e-ftdi-jtag-devkit.cfg index 30cfb5797d..57b0852a8a 100644 --- a/tcl/board/easydevkits/esp32-wrover-e-ftdi-jtag-devkit.cfg +++ b/tcl/board/easydevkits/esp32-wrover-e-ftdi-jtag-devkit.cfg @@ -12,7 +12,7 @@ adapter driver ftdi # Identify the device ftdi device_desc "EasyDevKit" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 # interface 0 is JTAG; interface 1 is the uart ftdi channel 0 diff --git a/tcl/board/ecp5_evaluation.cfg b/tcl/board/ecp5_evaluation.cfg index 1aafac4944..4e794e26a8 100644 --- a/tcl/board/ecp5_evaluation.cfg +++ b/tcl/board/ecp5_evaluation.cfg @@ -5,7 +5,7 @@ # adapter driver ftdi -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi channel 0 ftdi layout_init 0x0008 0x008b diff --git a/tcl/board/gatemate_eval.cfg b/tcl/board/gatemate_eval.cfg index c4d3f3dfda..cbb9ff291e 100644 --- a/tcl/board/gatemate_eval.cfg +++ b/tcl/board/gatemate_eval.cfg @@ -5,7 +5,7 @@ # adapter driver ftdi -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi channel 0 ftdi layout_init 0x0014 0x011b diff --git a/tcl/board/gowin_runber.cfg b/tcl/board/gowin_runber.cfg index aaa316f7ad..5e0addf6ad 100644 --- a/tcl/board/gowin_runber.cfg +++ b/tcl/board/gowin_runber.cfg @@ -4,7 +4,7 @@ # https://www.seeedstudio.com/Gowin-RUNBER-Development-Board-p-4779.html adapter driver ftdi -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi channel 0 ftdi layout_init 0x0008 0x008b diff --git a/tcl/board/gumstix-aerocore.cfg b/tcl/board/gumstix-aerocore.cfg index ddadc88c0b..e6591c4192 100644 --- a/tcl/board/gumstix-aerocore.cfg +++ b/tcl/board/gumstix-aerocore.cfg @@ -3,7 +3,7 @@ # JTAG for the STM32F4x chip used on the Gumstix AeroCore is available on # the first interface of a Quad FTDI chip. nTRST is bit 4. adapter driver ftdi -ftdi vid_pid 0x0403 0x6011 +adapter usb vid_pid 0x0403 0x6011 ftdi layout_init 0x0000 0x001b ftdi layout_signal nTRST -data 0x0010 diff --git a/tcl/board/kasli.cfg b/tcl/board/kasli.cfg index d85e1ca152..9256d4b577 100644 --- a/tcl/board/kasli.cfg +++ b/tcl/board/kasli.cfg @@ -2,7 +2,7 @@ adapter driver ftdi ftdi device_desc "Quad RS232-HS" -ftdi vid_pid 0x0403 0x6011 +adapter usb vid_pid 0x0403 0x6011 ftdi channel 0 ftdi layout_init 0x0008 0x000b # adapter usb location 1:8 diff --git a/tcl/board/nds32_corvettef1.cfg b/tcl/board/nds32_corvettef1.cfg index 7300ce04a2..0c2114d9e5 100644 --- a/tcl/board/nds32_corvettef1.cfg +++ b/tcl/board/nds32_corvettef1.cfg @@ -8,7 +8,7 @@ adapter speed 10000 adapter driver ftdi ftdi device_desc "Dual RS232-HS" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi layout_init 0x0c08 0x0f1b ftdi layout_signal nTRST -data 0x0100 -noe 0x0400 diff --git a/tcl/board/numato_mimas_a7.cfg b/tcl/board/numato_mimas_a7.cfg index 82d6a561b2..5f795a1b66 100644 --- a/tcl/board/numato_mimas_a7.cfg +++ b/tcl/board/numato_mimas_a7.cfg @@ -11,7 +11,7 @@ adapter driver ftdi ftdi device_desc "Mimas Artix 7 FPGA Module" -ftdi vid_pid 0x2a19 0x1009 +adapter usb vid_pid 0x2a19 0x1009 # channel 0 is for custom purpose by users (like uart, fifo etc) # channel 1 is reserved for JTAG (by-default) or SPI (possible via changing solder jumpers) diff --git a/tcl/board/quark_d2000_refboard.cfg b/tcl/board/quark_d2000_refboard.cfg index 3af5735a8b..7887d06c1d 100644 --- a/tcl/board/quark_d2000_refboard.cfg +++ b/tcl/board/quark_d2000_refboard.cfg @@ -4,7 +4,7 @@ # the board has an onboard FTDI FT232H chip adapter driver ftdi -ftdi vid_pid 0x0403 0x6014 +adapter usb vid_pid 0x0403 0x6014 ftdi channel 0 ftdi layout_init 0x0000 0x030b diff --git a/tcl/board/sayma_amc.cfg b/tcl/board/sayma_amc.cfg index b714609221..2323cf72a3 100644 --- a/tcl/board/sayma_amc.cfg +++ b/tcl/board/sayma_amc.cfg @@ -14,7 +14,7 @@ adapter driver ftdi ftdi device_desc "Quad RS232-HS" -ftdi vid_pid 0x0403 0x6011 +adapter usb vid_pid 0x0403 0x6011 ftdi channel 0 # Use this to distinguish multiple boards by topology #adapter usb location 5:1 diff --git a/tcl/board/sifive/hifive1.cfg b/tcl/board/sifive/hifive1.cfg index f69dc4fcc0..07e6541392 100644 --- a/tcl/board/sifive/hifive1.cfg +++ b/tcl/board/sifive/hifive1.cfg @@ -4,7 +4,7 @@ adapter speed 10000 adapter driver ftdi ftdi device_desc "Dual RS232-HS" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi layout_init 0x0008 0x001b ftdi layout_signal nSRST -oe 0x0020 -data 0x0020 diff --git a/tcl/board/trion_t20_bga256.cfg b/tcl/board/trion_t20_bga256.cfg index 572329ff61..ee6b484cd7 100644 --- a/tcl/board/trion_t20_bga256.cfg +++ b/tcl/board/trion_t20_bga256.cfg @@ -9,7 +9,7 @@ # CRESET_N and SS_N pins in addition to the standard JTAG pins. adapter driver ftdi -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi channel 1 ftdi layout_init 0x0008 0x008b diff --git a/tcl/interface/ftdi/100ask-openjtag.cfg b/tcl/interface/ftdi/100ask-openjtag.cfg index 5ab9252c69..272d602013 100644 --- a/tcl/interface/ftdi/100ask-openjtag.cfg +++ b/tcl/interface/ftdi/100ask-openjtag.cfg @@ -11,7 +11,7 @@ adapter driver ftdi ftdi device_desc "USB<=>JTAG&RS232" -ftdi vid_pid 0x1457 0x5118 +adapter usb vid_pid 0x1457 0x5118 ftdi layout_init 0x0f08 0x0f1b ftdi layout_signal nSRST -data 0x0200 -noe 0x0800 diff --git a/tcl/interface/ftdi/ashling-opella-ld-jtag.cfg b/tcl/interface/ftdi/ashling-opella-ld-jtag.cfg index 6256aa0c2b..6ea042777f 100644 --- a/tcl/interface/ftdi/ashling-opella-ld-jtag.cfg +++ b/tcl/interface/ftdi/ashling-opella-ld-jtag.cfg @@ -7,7 +7,7 @@ adapter driver ftdi ftdi device_desc "Opella-LD Debug Probe" -ftdi vid_pid 0x0B6B 0x0040 +adapter usb vid_pid 0x0B6B 0x0040 ftdi tdo_sample_edge falling ftdi layout_init 0x0A68 0xFF7B ftdi channel 0 diff --git a/tcl/interface/ftdi/ashling-opella-ld-swd.cfg b/tcl/interface/ftdi/ashling-opella-ld-swd.cfg index 4a4e4e0680..107e1b146c 100644 --- a/tcl/interface/ftdi/ashling-opella-ld-swd.cfg +++ b/tcl/interface/ftdi/ashling-opella-ld-swd.cfg @@ -7,7 +7,7 @@ adapter driver ftdi ftdi device_desc "Opella-LD Debug Probe" -ftdi vid_pid 0x0B6B 0x0040 +adapter usb vid_pid 0x0B6B 0x0040 ftdi layout_init 0x0860 0x0b7b ftdi channel 0 ftdi layout_signal JTAGOE -data 0x0010 diff --git a/tcl/interface/ftdi/axm0432.cfg b/tcl/interface/ftdi/axm0432.cfg index 50083996c3..590d9f2394 100644 --- a/tcl/interface/ftdi/axm0432.cfg +++ b/tcl/interface/ftdi/axm0432.cfg @@ -13,7 +13,7 @@ echo "so it could be marked as working or fixed." adapter driver ftdi ftdi device_desc "Symphony SoundBite" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi layout_init 0x0c08 0x0c2b ftdi layout_signal nTRST -data 0x0800 diff --git a/tcl/interface/ftdi/c232hm.cfg b/tcl/interface/ftdi/c232hm.cfg index 23c8f3af23..43340e9b82 100644 --- a/tcl/interface/ftdi/c232hm.cfg +++ b/tcl/interface/ftdi/c232hm.cfg @@ -20,7 +20,7 @@ adapter driver ftdi #ftdi device_desc "C232HM-EDHSL-0" # Common PID for FT232H -ftdi vid_pid 0x0403 0x6014 +adapter usb vid_pid 0x0403 0x6014 # Layout # High data byte 0x40 configures red LED on ACBUS6 initially high (unlit, since active-low) diff --git a/tcl/interface/ftdi/cortino.cfg b/tcl/interface/ftdi/cortino.cfg index 8bc8d6e4cc..6e4f6e56e2 100644 --- a/tcl/interface/ftdi/cortino.cfg +++ b/tcl/interface/ftdi/cortino.cfg @@ -8,7 +8,7 @@ adapter driver ftdi ftdi device_desc "Cortino" -ftdi vid_pid 0x0640 0x0032 +adapter usb vid_pid 0x0640 0x0032 ftdi layout_init 0x0108 0x010b ftdi layout_signal nTRST -data 0x0100 diff --git a/tcl/interface/ftdi/digilent-hs1.cfg b/tcl/interface/ftdi/digilent-hs1.cfg index 6a632ed268..5a418fd64f 100644 --- a/tcl/interface/ftdi/digilent-hs1.cfg +++ b/tcl/interface/ftdi/digilent-hs1.cfg @@ -5,7 +5,7 @@ adapter driver ftdi ftdi device_desc "Digilent Adept USB Device" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 # channel 1 does not have any functionality ftdi channel 0 # just TCK TDI TDO TMS, no reset diff --git a/tcl/interface/ftdi/digilent-hs2.cfg b/tcl/interface/ftdi/digilent-hs2.cfg index 89c9e4b6c4..4652d62e4a 100644 --- a/tcl/interface/ftdi/digilent-hs2.cfg +++ b/tcl/interface/ftdi/digilent-hs2.cfg @@ -8,7 +8,7 @@ adapter driver ftdi ftdi device_desc "Digilent Adept USB Device" -ftdi vid_pid 0x0403 0x6014 +adapter usb vid_pid 0x0403 0x6014 ftdi channel 0 ftdi layout_init 0x00e8 0x60eb diff --git a/tcl/interface/ftdi/digilent_jtag_hs3.cfg b/tcl/interface/ftdi/digilent_jtag_hs3.cfg index 78a233feb5..fc45650ba1 100644 --- a/tcl/interface/ftdi/digilent_jtag_hs3.cfg +++ b/tcl/interface/ftdi/digilent_jtag_hs3.cfg @@ -5,7 +5,7 @@ # adapter driver ftdi -ftdi vid_pid 0x0403 0x6014 +adapter usb vid_pid 0x0403 0x6014 ftdi device_desc "Digilent USB Device" # From Digilent support: diff --git a/tcl/interface/ftdi/digilent_jtag_smt2.cfg b/tcl/interface/ftdi/digilent_jtag_smt2.cfg index ac623a796d..8c723c060d 100644 --- a/tcl/interface/ftdi/digilent_jtag_smt2.cfg +++ b/tcl/interface/ftdi/digilent_jtag_smt2.cfg @@ -10,7 +10,7 @@ # adapter driver ftdi -ftdi vid_pid 0x0403 0x6014 +adapter usb vid_pid 0x0403 0x6014 ftdi layout_init 0x20e8 0x3feb ftdi layout_signal nSRST -data 0x2000 diff --git a/tcl/interface/ftdi/digilent_jtag_smt2_nc.cfg b/tcl/interface/ftdi/digilent_jtag_smt2_nc.cfg index 38236bc107..5abd31602e 100644 --- a/tcl/interface/ftdi/digilent_jtag_smt2_nc.cfg +++ b/tcl/interface/ftdi/digilent_jtag_smt2_nc.cfg @@ -14,7 +14,7 @@ adapter driver ftdi ftdi device_desc "Digilent USB Device" -ftdi vid_pid 0x0403 0x6014 +adapter usb vid_pid 0x0403 0x6014 ftdi channel 0 ftdi layout_init 0x00e8 0x60eb reset_config none diff --git a/tcl/interface/ftdi/dlp-usb1232h.cfg b/tcl/interface/ftdi/dlp-usb1232h.cfg index 67fee6b0f5..ce855d8b74 100644 --- a/tcl/interface/ftdi/dlp-usb1232h.cfg +++ b/tcl/interface/ftdi/dlp-usb1232h.cfg @@ -16,7 +16,7 @@ echo "mailing list, so it could be marked as working or fixed." adapter driver ftdi ftdi device_desc "Dual RS232-HS" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi layout_init 0x0008 0x000b ftdi layout_signal nTRST -data 0x0010 -oe 0x0010 diff --git a/tcl/interface/ftdi/dp_busblaster.cfg b/tcl/interface/ftdi/dp_busblaster.cfg index 373e122c46..8c6f6c2762 100644 --- a/tcl/interface/ftdi/dp_busblaster.cfg +++ b/tcl/interface/ftdi/dp_busblaster.cfg @@ -15,7 +15,7 @@ and use dp_busblaster_kt-link.cfg instead" adapter driver ftdi ftdi device_desc "Dual RS232-HS" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi layout_init 0x0c08 0x0f1b ftdi layout_signal nTRST -data 0x0100 -noe 0x0400 diff --git a/tcl/interface/ftdi/dp_busblaster_kt-link.cfg b/tcl/interface/ftdi/dp_busblaster_kt-link.cfg index 222ca3810b..20b79a8a0d 100644 --- a/tcl/interface/ftdi/dp_busblaster_kt-link.cfg +++ b/tcl/interface/ftdi/dp_busblaster_kt-link.cfg @@ -13,7 +13,7 @@ adapter driver ftdi ftdi device_desc "Dual RS232-HS" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi layout_init 0x8c28 0xff3b ftdi layout_signal nTRST -data 0x0100 -noe 0x0400 diff --git a/tcl/interface/ftdi/esp32_devkitj_v1.cfg b/tcl/interface/ftdi/esp32_devkitj_v1.cfg index 438d14be23..c3139894fe 100644 --- a/tcl/interface/ftdi/esp32_devkitj_v1.cfg +++ b/tcl/interface/ftdi/esp32_devkitj_v1.cfg @@ -5,7 +5,7 @@ # adapter driver ftdi -ftdi vid_pid 0x0403 0x6010 0x0403 0x6014 +adapter usb vid_pid 0x0403 0x6010 0x0403 0x6014 # interface 1 is the uart ftdi channel 0 diff --git a/tcl/interface/ftdi/esp32s2_kaluga_v1.cfg b/tcl/interface/ftdi/esp32s2_kaluga_v1.cfg index c531f3da0c..ae1b20564d 100644 --- a/tcl/interface/ftdi/esp32s2_kaluga_v1.cfg +++ b/tcl/interface/ftdi/esp32s2_kaluga_v1.cfg @@ -8,7 +8,7 @@ # adapter driver ftdi -ftdi vid_pid 0x0403 0x6010 0x0403 0x6014 +adapter usb vid_pid 0x0403 0x6010 0x0403 0x6014 # interface 1 is the uart ftdi channel 0 diff --git a/tcl/interface/ftdi/flossjtag-noeeprom.cfg b/tcl/interface/ftdi/flossjtag-noeeprom.cfg index 1008e1ae68..658c0dfd75 100644 --- a/tcl/interface/ftdi/flossjtag-noeeprom.cfg +++ b/tcl/interface/ftdi/flossjtag-noeeprom.cfg @@ -21,7 +21,7 @@ echo "so it could be marked as working or fixed." adapter driver ftdi ftdi device_desc "Dual RS232-HS" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi layout_init 0x0008 0x000b ftdi layout_signal nTRST -data 0x0010 -oe 0x0010 diff --git a/tcl/interface/ftdi/flossjtag.cfg b/tcl/interface/ftdi/flossjtag.cfg index 90ba63a4cd..13c4136385 100644 --- a/tcl/interface/ftdi/flossjtag.cfg +++ b/tcl/interface/ftdi/flossjtag.cfg @@ -20,7 +20,7 @@ echo "Please report your experience with this file to openocd-devel mailing list echo "so it could be marked as working or fixed." adapter driver ftdi -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi device_desc "FLOSS-JTAG" # adapter serial "FJ000001" diff --git a/tcl/interface/ftdi/flyswatter.cfg b/tcl/interface/ftdi/flyswatter.cfg index 8bce00dbbf..9f59542c3b 100644 --- a/tcl/interface/ftdi/flyswatter.cfg +++ b/tcl/interface/ftdi/flyswatter.cfg @@ -8,7 +8,7 @@ adapter driver ftdi ftdi device_desc "Flyswatter" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi layout_init 0x0818 0x0cfb ftdi layout_signal nTRST -data 0x0010 diff --git a/tcl/interface/ftdi/flyswatter2.cfg b/tcl/interface/ftdi/flyswatter2.cfg index ebc00fe601..4c0a5c3e05 100644 --- a/tcl/interface/ftdi/flyswatter2.cfg +++ b/tcl/interface/ftdi/flyswatter2.cfg @@ -8,7 +8,7 @@ adapter driver ftdi ftdi device_desc "Flyswatter2" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi layout_init 0x0538 0x057b ftdi layout_signal LED -ndata 0x0400 diff --git a/tcl/interface/ftdi/ft232h-module-swd.cfg b/tcl/interface/ftdi/ft232h-module-swd.cfg index d09ccf16d4..e7fe463a7e 100644 --- a/tcl/interface/ftdi/ft232h-module-swd.cfg +++ b/tcl/interface/ftdi/ft232h-module-swd.cfg @@ -10,7 +10,7 @@ adapter driver ftdi -ftdi vid_pid 0x0403 0x6014 +adapter usb vid_pid 0x0403 0x6014 # data MSB..LSB direction (1:out) MSB..LSB # 0000'0000'0011'0000 0000'0000'0011'1011 diff --git a/tcl/interface/ftdi/gw16042.cfg b/tcl/interface/ftdi/gw16042.cfg index 326a88fa02..0e7b097d54 100644 --- a/tcl/interface/ftdi/gw16042.cfg +++ b/tcl/interface/ftdi/gw16042.cfg @@ -21,7 +21,7 @@ adapter driver ftdi ftdi device_desc "USB-JTAG" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi layout_init 0x0058 0x007b ftdi layout_signal nTRST -data 0x0010 diff --git a/tcl/interface/ftdi/hie-jtag.cfg b/tcl/interface/ftdi/hie-jtag.cfg index 6694df0484..155e041384 100644 --- a/tcl/interface/ftdi/hie-jtag.cfg +++ b/tcl/interface/ftdi/hie-jtag.cfg @@ -7,7 +7,7 @@ adapter driver ftdi ftdi channel 0 -ftdi vid_pid 0x0403 0x6014 +adapter usb vid_pid 0x0403 0x6014 ftdi device_desc "HIE JTAG Debugger" ftdi layout_init 0x0c08 0x4f1b diff --git a/tcl/interface/ftdi/hilscher_nxhx10_etm.cfg b/tcl/interface/ftdi/hilscher_nxhx10_etm.cfg index d5d24e5fc5..17a222b311 100644 --- a/tcl/interface/ftdi/hilscher_nxhx10_etm.cfg +++ b/tcl/interface/ftdi/hilscher_nxhx10_etm.cfg @@ -13,7 +13,7 @@ echo "so it could be marked as working or fixed." adapter driver ftdi ftdi device_desc "NXHX 10-ETM" -ftdi vid_pid 0x0640 0x0028 +adapter usb vid_pid 0x0640 0x0028 ftdi layout_init 0x0308 0x030b ftdi layout_signal nTRST -data 0x0100 diff --git a/tcl/interface/ftdi/hilscher_nxhx500_etm.cfg b/tcl/interface/ftdi/hilscher_nxhx500_etm.cfg index 003b9df6b3..5d5c262b41 100644 --- a/tcl/interface/ftdi/hilscher_nxhx500_etm.cfg +++ b/tcl/interface/ftdi/hilscher_nxhx500_etm.cfg @@ -13,7 +13,7 @@ echo "so it could be marked as working or fixed." adapter driver ftdi ftdi device_desc "NXHX 500-ETM" -ftdi vid_pid 0x0640 0x0028 +adapter usb vid_pid 0x0640 0x0028 ftdi layout_init 0x0308 0x030b ftdi layout_signal nTRST -data 0x0100 diff --git a/tcl/interface/ftdi/hilscher_nxhx500_re.cfg b/tcl/interface/ftdi/hilscher_nxhx500_re.cfg index 97ad38075d..39afe43f23 100644 --- a/tcl/interface/ftdi/hilscher_nxhx500_re.cfg +++ b/tcl/interface/ftdi/hilscher_nxhx500_re.cfg @@ -13,7 +13,7 @@ echo "so it could be marked as working or fixed." adapter driver ftdi ftdi device_desc "NXHX 500-RE" -ftdi vid_pid 0x0640 0x0028 +adapter usb vid_pid 0x0640 0x0028 ftdi layout_init 0x0308 0x030b ftdi layout_signal nTRST -data 0x0100 diff --git a/tcl/interface/ftdi/hilscher_nxhx50_etm.cfg b/tcl/interface/ftdi/hilscher_nxhx50_etm.cfg index 06280c1ffd..0ae7088819 100644 --- a/tcl/interface/ftdi/hilscher_nxhx50_etm.cfg +++ b/tcl/interface/ftdi/hilscher_nxhx50_etm.cfg @@ -13,7 +13,7 @@ echo "so it could be marked as working or fixed." adapter driver ftdi ftdi device_desc "NXHX 50-ETM" -ftdi vid_pid 0x0640 0x0028 +adapter usb vid_pid 0x0640 0x0028 ftdi layout_init 0x0308 0x030b ftdi layout_signal nTRST -data 0x0100 diff --git a/tcl/interface/ftdi/hilscher_nxhx50_re.cfg b/tcl/interface/ftdi/hilscher_nxhx50_re.cfg index f14be626b0..fb1bdb2e9e 100644 --- a/tcl/interface/ftdi/hilscher_nxhx50_re.cfg +++ b/tcl/interface/ftdi/hilscher_nxhx50_re.cfg @@ -13,7 +13,7 @@ echo "so it could be marked as working or fixed." adapter driver ftdi ftdi device_desc "NXHX50-RE" -ftdi vid_pid 0x0640 0x0028 +adapter usb vid_pid 0x0640 0x0028 ftdi layout_init 0x0308 0x030b ftdi layout_signal nTRST -data 0x0100 diff --git a/tcl/interface/ftdi/hitex_lpc1768stick.cfg b/tcl/interface/ftdi/hitex_lpc1768stick.cfg index 91bd5a8423..3d32201953 100644 --- a/tcl/interface/ftdi/hitex_lpc1768stick.cfg +++ b/tcl/interface/ftdi/hitex_lpc1768stick.cfg @@ -9,7 +9,7 @@ adapter driver ftdi ftdi device_desc "LPC1768-Stick" -ftdi vid_pid 0x0640 0x0026 +adapter usb vid_pid 0x0640 0x0026 ftdi layout_init 0x0388 0x038b ftdi layout_signal nTRST -data 0x0100 diff --git a/tcl/interface/ftdi/hitex_str9-comstick.cfg b/tcl/interface/ftdi/hitex_str9-comstick.cfg index f698677a63..bbeefd15c5 100644 --- a/tcl/interface/ftdi/hitex_str9-comstick.cfg +++ b/tcl/interface/ftdi/hitex_str9-comstick.cfg @@ -8,7 +8,7 @@ adapter driver ftdi ftdi device_desc "STR9-comStick" -ftdi vid_pid 0x0640 0x002c +adapter usb vid_pid 0x0640 0x002c ftdi layout_init 0x0108 0x010b ftdi layout_signal nTRST -data 0x0100 diff --git a/tcl/interface/ftdi/icebear.cfg b/tcl/interface/ftdi/icebear.cfg index 4a763994b5..230d8af0ca 100644 --- a/tcl/interface/ftdi/icebear.cfg +++ b/tcl/interface/ftdi/icebear.cfg @@ -13,7 +13,7 @@ echo "so it could be marked as working or fixed." adapter driver ftdi ftdi device_desc "ICEbear JTAG adapter" -ftdi vid_pid 0x0403 0xc140 +adapter usb vid_pid 0x0403 0xc140 ftdi layout_init 0x0028 0x002b ftdi layout_signal nTRST -data 0x0010 -oe 0x0010 diff --git a/tcl/interface/ftdi/imx8mp-evk.cfg b/tcl/interface/ftdi/imx8mp-evk.cfg index 02564dc99e..b53c4b6c09 100644 --- a/tcl/interface/ftdi/imx8mp-evk.cfg +++ b/tcl/interface/ftdi/imx8mp-evk.cfg @@ -13,7 +13,7 @@ # adapter driver ftdi -ftdi vid_pid 0x0403 0x6011 +adapter usb vid_pid 0x0403 0x6011 ftdi channel 0 ftdi layout_init 0x00f8 0x000b diff --git a/tcl/interface/ftdi/incircuit-icprog.cfg b/tcl/interface/ftdi/incircuit-icprog.cfg index 81f2872205..f46b0a902e 100644 --- a/tcl/interface/ftdi/incircuit-icprog.cfg +++ b/tcl/interface/ftdi/incircuit-icprog.cfg @@ -9,7 +9,7 @@ # adapter driver ftdi -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi layout_init 0x0508 0x0f1b ftdi layout_signal nSRST -noe 0x0400 -data 0x0800 diff --git a/tcl/interface/ftdi/iotlab-usb.cfg b/tcl/interface/ftdi/iotlab-usb.cfg index b7a004e848..c607548678 100644 --- a/tcl/interface/ftdi/iotlab-usb.cfg +++ b/tcl/interface/ftdi/iotlab-usb.cfg @@ -6,7 +6,7 @@ # adapter driver ftdi -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi layout_init 0x0008 0x000b ftdi layout_signal nTRST -data 0x0010 -oe 0x0010 diff --git a/tcl/interface/ftdi/isodebug.cfg b/tcl/interface/ftdi/isodebug.cfg index 0a6e0807ec..4b9a406dde 100644 --- a/tcl/interface/ftdi/isodebug.cfg +++ b/tcl/interface/ftdi/isodebug.cfg @@ -4,7 +4,7 @@ # 5 kV isolated JTAG/SWD + UART adapter by Unjo AB adapter driver ftdi -ftdi vid_pid 0x22b7 0x150d +adapter usb vid_pid 0x22b7 0x150d ftdi layout_init 0x0ff8 0xfffb diff --git a/tcl/interface/ftdi/jtag-lock-pick_tiny_2.cfg b/tcl/interface/ftdi/jtag-lock-pick_tiny_2.cfg index ea60dcfc39..74d4f55a9d 100644 --- a/tcl/interface/ftdi/jtag-lock-pick_tiny_2.cfg +++ b/tcl/interface/ftdi/jtag-lock-pick_tiny_2.cfg @@ -8,7 +8,7 @@ adapter driver ftdi ftdi device_desc "JTAG-lock-pick Tiny 2" -ftdi vid_pid 0x0403 0x8220 +adapter usb vid_pid 0x0403 0x8220 ftdi layout_init 0x8c28 0xff3b ftdi layout_signal SWD_EN -ndata 0x0020 -oe 0x2000 diff --git a/tcl/interface/ftdi/jtagkey.cfg b/tcl/interface/ftdi/jtagkey.cfg index 1c1c09d3fd..a066cf5e8b 100644 --- a/tcl/interface/ftdi/jtagkey.cfg +++ b/tcl/interface/ftdi/jtagkey.cfg @@ -8,7 +8,7 @@ adapter driver ftdi ftdi device_desc "Amontec JTAGkey" -ftdi vid_pid 0x0403 0xcff8 +adapter usb vid_pid 0x0403 0xcff8 ftdi layout_init 0x0c08 0x0f1b ftdi layout_signal nTRST -data 0x0100 -noe 0x0400 diff --git a/tcl/interface/ftdi/jtagkey2.cfg b/tcl/interface/ftdi/jtagkey2.cfg index 80df347c38..68a8fe228d 100644 --- a/tcl/interface/ftdi/jtagkey2.cfg +++ b/tcl/interface/ftdi/jtagkey2.cfg @@ -8,7 +8,7 @@ adapter driver ftdi ftdi device_desc "Amontec JTAGkey-2" -ftdi vid_pid 0x0403 0xcff8 +adapter usb vid_pid 0x0403 0xcff8 ftdi layout_init 0x0c08 0x0f1b ftdi layout_signal nTRST -data 0x0100 -noe 0x0400 diff --git a/tcl/interface/ftdi/jtagkey2p.cfg b/tcl/interface/ftdi/jtagkey2p.cfg index 3a76bd085a..72ab634fb8 100644 --- a/tcl/interface/ftdi/jtagkey2p.cfg +++ b/tcl/interface/ftdi/jtagkey2p.cfg @@ -8,7 +8,7 @@ adapter driver ftdi ftdi device_desc "Amontec JTAGkey-2P" -ftdi vid_pid 0x0403 0xcff8 +adapter usb vid_pid 0x0403 0xcff8 ftdi layout_init 0x0c08 0x0f1b ftdi layout_signal nTRST -data 0x0100 -noe 0x0400 diff --git a/tcl/interface/ftdi/kt-link.cfg b/tcl/interface/ftdi/kt-link.cfg index 61c6b831b7..60a9bdd9ec 100644 --- a/tcl/interface/ftdi/kt-link.cfg +++ b/tcl/interface/ftdi/kt-link.cfg @@ -8,7 +8,7 @@ adapter driver ftdi ftdi device_desc "KT-LINK" -ftdi vid_pid 0x0403 0xbbe2 +adapter usb vid_pid 0x0403 0xbbe2 ftdi layout_init 0x8c28 0xff3b ftdi layout_signal nTRST -data 0x0100 -noe 0x0400 diff --git a/tcl/interface/ftdi/lambdaconcept_ecpix-5.cfg b/tcl/interface/ftdi/lambdaconcept_ecpix-5.cfg index df4955f8a1..7a79183a27 100644 --- a/tcl/interface/ftdi/lambdaconcept_ecpix-5.cfg +++ b/tcl/interface/ftdi/lambdaconcept_ecpix-5.cfg @@ -8,7 +8,7 @@ adapter driver ftdi adapter speed 10000 ftdi device_desc "Dual RS232-HS" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi layout_init 0xfff8 0xfffb transport select jtag diff --git a/tcl/interface/ftdi/lisa-l.cfg b/tcl/interface/ftdi/lisa-l.cfg index 75c5cbe7fd..e35e8ce09e 100644 --- a/tcl/interface/ftdi/lisa-l.cfg +++ b/tcl/interface/ftdi/lisa-l.cfg @@ -13,7 +13,7 @@ echo "mailing list, so it could be marked as working or fixed." adapter driver ftdi ftdi device_desc "Lisa/L" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi channel 1 ftdi layout_init 0x0008 0x180b diff --git a/tcl/interface/ftdi/luminary-icdi.cfg b/tcl/interface/ftdi/luminary-icdi.cfg index 9142503dd0..ffc92b6d95 100644 --- a/tcl/interface/ftdi/luminary-icdi.cfg +++ b/tcl/interface/ftdi/luminary-icdi.cfg @@ -19,7 +19,7 @@ adapter driver ftdi ftdi device_desc "Luminary Micro ICDI Board" -ftdi vid_pid 0x0403 0xbcda +adapter usb vid_pid 0x0403 0xbcda ftdi layout_init 0x00a8 0x00eb ftdi layout_signal nSRST -noe 0x0020 diff --git a/tcl/interface/ftdi/luminary-lm3s811.cfg b/tcl/interface/ftdi/luminary-lm3s811.cfg index 98be166fd6..bf9b2aa64e 100644 --- a/tcl/interface/ftdi/luminary-lm3s811.cfg +++ b/tcl/interface/ftdi/luminary-lm3s811.cfg @@ -15,7 +15,7 @@ adapter driver ftdi ftdi device_desc "LM3S811 Evaluation Board" -ftdi vid_pid 0x0403 0xbcd9 +adapter usb vid_pid 0x0403 0xbcd9 ftdi layout_init 0x0088 0x008b ftdi layout_signal nSRST -data 0x0020 -oe 0x0020 diff --git a/tcl/interface/ftdi/luminary.cfg b/tcl/interface/ftdi/luminary.cfg index 27d9a9da05..f34d74fca3 100644 --- a/tcl/interface/ftdi/luminary.cfg +++ b/tcl/interface/ftdi/luminary.cfg @@ -28,7 +28,7 @@ adapter driver ftdi ftdi device_desc "Stellaris Evaluation Board" -ftdi vid_pid 0x0403 0xbcd9 +adapter usb vid_pid 0x0403 0xbcd9 ftdi layout_init 0x00a8 0x00eb ftdi layout_signal nSRST -noe 0x0020 diff --git a/tcl/interface/ftdi/m53evk.cfg b/tcl/interface/ftdi/m53evk.cfg index 2d9c30448b..409d62ed61 100644 --- a/tcl/interface/ftdi/m53evk.cfg +++ b/tcl/interface/ftdi/m53evk.cfg @@ -8,7 +8,7 @@ adapter driver ftdi ftdi device_desc "Dual RS232-HS" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi channel 0 ftdi layout_init 0x0008 0x000b diff --git a/tcl/interface/ftdi/mbftdi.cfg b/tcl/interface/ftdi/mbftdi.cfg index 09cec9ffb3..dc9f2ca698 100644 --- a/tcl/interface/ftdi/mbftdi.cfg +++ b/tcl/interface/ftdi/mbftdi.cfg @@ -13,6 +13,6 @@ adapter driver ftdi ftdi device_desc "Dual RS232-HS" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi layout_init 0x0008 0x000b diff --git a/tcl/interface/ftdi/minimodule-swd.cfg b/tcl/interface/ftdi/minimodule-swd.cfg index 3eb2f53278..8d21503e5a 100644 --- a/tcl/interface/ftdi/minimodule-swd.cfg +++ b/tcl/interface/ftdi/minimodule-swd.cfg @@ -41,11 +41,11 @@ adapter driver ftdi #Select your module type and channel #ftdi device_desc "FT2232H MiniModule" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 #ftdi channel 1 #ftdi device_desc "FT4232H MiniModule" -#ftdi vid_pid 0x0403 0x6011 +#adapter usb vid_pid 0x0403 0x6011 #ftdi channel 1 ftdi layout_init 0x0000 0x000b diff --git a/tcl/interface/ftdi/minimodule.cfg b/tcl/interface/ftdi/minimodule.cfg index 825d7c1dc8..4adad78856 100644 --- a/tcl/interface/ftdi/minimodule.cfg +++ b/tcl/interface/ftdi/minimodule.cfg @@ -8,7 +8,7 @@ adapter driver ftdi ftdi device_desc "FT2232H MiniModule" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 # Every pin set as high impedance except TCK, TDI, TDO and TMS ftdi layout_init 0x0008 0x000b diff --git a/tcl/interface/ftdi/minispartan6.cfg b/tcl/interface/ftdi/minispartan6.cfg index f12bae621c..c22886c141 100644 --- a/tcl/interface/ftdi/minispartan6.cfg +++ b/tcl/interface/ftdi/minispartan6.cfg @@ -6,7 +6,7 @@ adapter driver ftdi # The miniSpartan6+ sadly doesn't have a custom device description, so we just # have to hope you got it right. #ftdi device_desc "Dual RS232-HS" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 # interface 1 is the uart ftdi channel 0 # just TCK TDI TDO TMS, no reset diff --git a/tcl/interface/ftdi/miniwiggler.cfg b/tcl/interface/ftdi/miniwiggler.cfg index ebaa97920b..e6d6903cab 100644 --- a/tcl/interface/ftdi/miniwiggler.cfg +++ b/tcl/interface/ftdi/miniwiggler.cfg @@ -26,7 +26,7 @@ adapter driver ftdi ftdi device_desc "DAS JDS miniWiggler V3.1" -ftdi vid_pid 0x058b 0x0043 +adapter usb vid_pid 0x058b 0x0043 ftdi channel 0 ftdi layout_init 0x0008 0x001b diff --git a/tcl/interface/ftdi/neodb.cfg b/tcl/interface/ftdi/neodb.cfg index d3b35412fb..42babc2b9d 100644 --- a/tcl/interface/ftdi/neodb.cfg +++ b/tcl/interface/ftdi/neodb.cfg @@ -8,7 +8,7 @@ adapter driver ftdi ftdi device_desc "Debug Board for Neo1973" -ftdi vid_pid 0x1457 0x5118 +adapter usb vid_pid 0x1457 0x5118 ftdi layout_init 0x0508 0x0f1b ftdi layout_signal nTRST -data 0x0200 -noe 0x0100 diff --git a/tcl/interface/ftdi/ngxtech.cfg b/tcl/interface/ftdi/ngxtech.cfg index 635333fb97..e961defcc2 100644 --- a/tcl/interface/ftdi/ngxtech.cfg +++ b/tcl/interface/ftdi/ngxtech.cfg @@ -14,7 +14,7 @@ echo "as working or fixed." adapter driver ftdi ftdi device_desc "NGX JTAG" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi layout_init 0x0508 0x0f1b ftdi layout_signal nTRST -data 0x0200 -noe 0x0100 diff --git a/tcl/interface/ftdi/olimex-arm-jtag-cjtag.cfg b/tcl/interface/ftdi/olimex-arm-jtag-cjtag.cfg index 25addb0ca6..abd7d90a34 100644 --- a/tcl/interface/ftdi/olimex-arm-jtag-cjtag.cfg +++ b/tcl/interface/ftdi/olimex-arm-jtag-cjtag.cfg @@ -14,7 +14,7 @@ interface ftdi ftdi oscan1_mode on ftdi device_desc "Olimex OpenOCD JTAG ARM-USB-TINY-H" -ftdi vid_pid 0x15ba 0x002a +adapter usb vid_pid 0x15ba 0x002a ftdi layout_init 0x0808 0x0a1b ftdi layout_signal nSRST -oe 0x0200 diff --git a/tcl/interface/ftdi/olimex-arm-usb-ocd-h-cjtag.cfg b/tcl/interface/ftdi/olimex-arm-usb-ocd-h-cjtag.cfg index 85d66ef018..bbd7613885 100644 --- a/tcl/interface/ftdi/olimex-arm-usb-ocd-h-cjtag.cfg +++ b/tcl/interface/ftdi/olimex-arm-usb-ocd-h-cjtag.cfg @@ -9,7 +9,7 @@ interface ftdi ftdi oscan1_mode on ftdi device_desc "Olimex OpenOCD JTAG ARM-USB-OCD-H" -ftdi vid_pid 0x15ba 0x002b +adapter usb vid_pid 0x15ba 0x002b ftdi layout_init 0x0808 0x0a1b ftdi layout_signal nSRST -oe 0x0200 diff --git a/tcl/interface/ftdi/olimex-arm-usb-ocd-h.cfg b/tcl/interface/ftdi/olimex-arm-usb-ocd-h.cfg index cd11ad8e11..a568b8b0b8 100644 --- a/tcl/interface/ftdi/olimex-arm-usb-ocd-h.cfg +++ b/tcl/interface/ftdi/olimex-arm-usb-ocd-h.cfg @@ -8,7 +8,7 @@ adapter driver ftdi ftdi device_desc "Olimex OpenOCD JTAG ARM-USB-OCD-H" -ftdi vid_pid 0x15ba 0x002b +adapter usb vid_pid 0x15ba 0x002b ftdi layout_init 0x0908 0x0b1b ftdi layout_signal nSRST -oe 0x0200 diff --git a/tcl/interface/ftdi/olimex-arm-usb-ocd.cfg b/tcl/interface/ftdi/olimex-arm-usb-ocd.cfg index d2261e2b77..ba5386af1f 100644 --- a/tcl/interface/ftdi/olimex-arm-usb-ocd.cfg +++ b/tcl/interface/ftdi/olimex-arm-usb-ocd.cfg @@ -8,7 +8,7 @@ adapter driver ftdi ftdi device_desc "Olimex OpenOCD JTAG" -ftdi vid_pid 0x15ba 0x0003 +adapter usb vid_pid 0x15ba 0x0003 ftdi layout_init 0x0c08 0x0f1b ftdi layout_signal nSRST -oe 0x0200 diff --git a/tcl/interface/ftdi/olimex-arm-usb-tiny-h-cjtag.cfg b/tcl/interface/ftdi/olimex-arm-usb-tiny-h-cjtag.cfg index ee09e81e2a..bd32b4b48d 100644 --- a/tcl/interface/ftdi/olimex-arm-usb-tiny-h-cjtag.cfg +++ b/tcl/interface/ftdi/olimex-arm-usb-tiny-h-cjtag.cfg @@ -14,7 +14,7 @@ interface ftdi ftdi oscan1_mode on ftdi device_desc "Olimex OpenOCD JTAG ARM-USB-TINY-H" -ftdi vid_pid 0x15ba 0x002a +adapter usb vid_pid 0x15ba 0x002a ftdi layout_init 0x0808 0x0a1b ftdi layout_signal nSRST -oe 0x0200 diff --git a/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg b/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg index a2b3e3edfc..1e43974402 100644 --- a/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg +++ b/tcl/interface/ftdi/olimex-arm-usb-tiny-h.cfg @@ -8,7 +8,7 @@ adapter driver ftdi ftdi device_desc "Olimex OpenOCD JTAG ARM-USB-TINY-H" -ftdi vid_pid 0x15ba 0x002a +adapter usb vid_pid 0x15ba 0x002a ftdi layout_init 0x0808 0x0a1b ftdi layout_signal nSRST -oe 0x0200 diff --git a/tcl/interface/ftdi/olimex-jtag-tiny.cfg b/tcl/interface/ftdi/olimex-jtag-tiny.cfg index 7d8e81da3c..f3a83c8e3e 100644 --- a/tcl/interface/ftdi/olimex-jtag-tiny.cfg +++ b/tcl/interface/ftdi/olimex-jtag-tiny.cfg @@ -8,7 +8,7 @@ adapter driver ftdi ftdi device_desc "Olimex OpenOCD JTAG TINY" -ftdi vid_pid 0x15ba 0x0004 +adapter usb vid_pid 0x15ba 0x0004 ftdi layout_init 0x0808 0x0a1b ftdi layout_signal nSRST -oe 0x0200 diff --git a/tcl/interface/ftdi/oocdlink.cfg b/tcl/interface/ftdi/oocdlink.cfg index 0e99b67a4d..226567b706 100644 --- a/tcl/interface/ftdi/oocdlink.cfg +++ b/tcl/interface/ftdi/oocdlink.cfg @@ -14,7 +14,7 @@ echo "as working or fixed." adapter driver ftdi ftdi device_desc "OOCDLink" -ftdi vid_pid 0x0403 0xbaf8 +adapter usb vid_pid 0x0403 0xbaf8 ftdi layout_init 0x0508 0x0f1b ftdi layout_signal nTRST -data 0x0200 -noe 0x0100 diff --git a/tcl/interface/ftdi/opendous_ftdi.cfg b/tcl/interface/ftdi/opendous_ftdi.cfg index 5d6f5aee1a..0bd7fdab95 100644 --- a/tcl/interface/ftdi/opendous_ftdi.cfg +++ b/tcl/interface/ftdi/opendous_ftdi.cfg @@ -11,7 +11,7 @@ adapter driver ftdi ftdi device_desc "Dual RS232-HS" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi channel 1 ftdi layout_init 0x0c08 0x0f1b diff --git a/tcl/interface/ftdi/openocd-usb-hs.cfg b/tcl/interface/ftdi/openocd-usb-hs.cfg index af1f61c33d..a270d10fc1 100644 --- a/tcl/interface/ftdi/openocd-usb-hs.cfg +++ b/tcl/interface/ftdi/openocd-usb-hs.cfg @@ -8,7 +8,7 @@ adapter driver ftdi ftdi device_desc "Dual RS232-HS" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi layout_init 0x0508 0x0f1b ftdi layout_signal nTRST -data 0x0200 -noe 0x0100 diff --git a/tcl/interface/ftdi/openocd-usb.cfg b/tcl/interface/ftdi/openocd-usb.cfg index c333d65ca9..e9dea563c5 100644 --- a/tcl/interface/ftdi/openocd-usb.cfg +++ b/tcl/interface/ftdi/openocd-usb.cfg @@ -8,7 +8,7 @@ adapter driver ftdi ftdi device_desc "Dual RS232" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi layout_init 0x0508 0x0f1b ftdi layout_signal nTRST -data 0x0200 -noe 0x0100 diff --git a/tcl/interface/ftdi/openrd.cfg b/tcl/interface/ftdi/openrd.cfg index b6b2d1d93e..875ca0a07f 100644 --- a/tcl/interface/ftdi/openrd.cfg +++ b/tcl/interface/ftdi/openrd.cfg @@ -8,7 +8,7 @@ adapter driver ftdi ftdi device_desc "OpenRD JTAGKey FT2232D B" -ftdi vid_pid 0x0403 0x9e90 +adapter usb vid_pid 0x0403 0x9e90 ftdi channel 0 ftdi layout_init 0x0608 0x0f1b diff --git a/tcl/interface/ftdi/pipistrello.cfg b/tcl/interface/ftdi/pipistrello.cfg index 29ecd12292..2a27f45b2a 100644 --- a/tcl/interface/ftdi/pipistrello.cfg +++ b/tcl/interface/ftdi/pipistrello.cfg @@ -4,7 +4,7 @@ # http://www.saanlima.com/download/pipistrello-v2.0/pipistrello_v2_schematic.pdf adapter driver ftdi ftdi device_desc "Pipistrello LX45" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 # interface 1 is the uart ftdi channel 0 # just TCK TDI TDO TMS, no reset diff --git a/tcl/interface/ftdi/pls_spc5.cfg b/tcl/interface/ftdi/pls_spc5.cfg index 3b3c2d6475..09a21ff4dc 100644 --- a/tcl/interface/ftdi/pls_spc5.cfg +++ b/tcl/interface/ftdi/pls_spc5.cfg @@ -28,7 +28,7 @@ adapter driver ftdi ftdi device_desc "PLS USB/JTAG Adapter for SPC5xxx" -ftdi vid_pid 0x263d 0x4001 +adapter usb vid_pid 0x263d 0x4001 ftdi channel 0 ftdi layout_init 0x0008 0x000b diff --git a/tcl/interface/ftdi/redbee-econotag.cfg b/tcl/interface/ftdi/redbee-econotag.cfg index d0d3d833e1..2491ea0eb9 100644 --- a/tcl/interface/ftdi/redbee-econotag.cfg +++ b/tcl/interface/ftdi/redbee-econotag.cfg @@ -16,7 +16,7 @@ echo "Please report your experience with this file to openocd-devel mailing list echo "so it could be marked as working or fixed." adapter driver ftdi -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi layout_init 0x0c08 0x0c2b ftdi layout_signal nTRST -data 0x0800 diff --git a/tcl/interface/ftdi/redbee-usb.cfg b/tcl/interface/ftdi/redbee-usb.cfg index 98805536d2..880c5d53eb 100644 --- a/tcl/interface/ftdi/redbee-usb.cfg +++ b/tcl/interface/ftdi/redbee-usb.cfg @@ -16,7 +16,7 @@ echo "Please report your experience with this file to openocd-devel mailing list echo "so it could be marked as working or fixed." adapter driver ftdi -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi channel 1 ftdi layout_init 0x0c08 0x0c2b diff --git a/tcl/interface/ftdi/sheevaplug.cfg b/tcl/interface/ftdi/sheevaplug.cfg index 29c8688091..c889a634ea 100644 --- a/tcl/interface/ftdi/sheevaplug.cfg +++ b/tcl/interface/ftdi/sheevaplug.cfg @@ -8,7 +8,7 @@ adapter driver ftdi ftdi device_desc "SheevaPlug JTAGKey FT2232D B" -ftdi vid_pid 0x9e88 0x9e8f +adapter usb vid_pid 0x9e88 0x9e8f ftdi channel 0 ftdi layout_init 0x0608 0x0f1b diff --git a/tcl/interface/ftdi/signalyzer-lite.cfg b/tcl/interface/ftdi/signalyzer-lite.cfg index e6c3839c98..068de80ef2 100644 --- a/tcl/interface/ftdi/signalyzer-lite.cfg +++ b/tcl/interface/ftdi/signalyzer-lite.cfg @@ -13,7 +13,7 @@ echo "so it could be marked as working or fixed." adapter driver ftdi ftdi device_desc "Signalyzer LITE" -ftdi vid_pid 0x0403 0xbca1 +adapter usb vid_pid 0x0403 0xbca1 ftdi layout_init 0x0008 0x000b ftdi layout_signal nTRST -data 0x0010 -oe 0x0010 diff --git a/tcl/interface/ftdi/signalyzer.cfg b/tcl/interface/ftdi/signalyzer.cfg index fa7a7edc1e..739a5702bf 100644 --- a/tcl/interface/ftdi/signalyzer.cfg +++ b/tcl/interface/ftdi/signalyzer.cfg @@ -13,7 +13,7 @@ echo "so it could be marked as working or fixed." adapter driver ftdi ftdi device_desc "Signalyzer" -ftdi vid_pid 0x0403 0xbca0 +adapter usb vid_pid 0x0403 0xbca0 ftdi layout_init 0x0008 0x000b ftdi layout_signal nTRST -data 0x0010 -oe 0x0010 diff --git a/tcl/interface/ftdi/sipeed-rv-debugger.cfg b/tcl/interface/ftdi/sipeed-rv-debugger.cfg index ca65398c6e..ae4ee90bf8 100644 --- a/tcl/interface/ftdi/sipeed-rv-debugger.cfg +++ b/tcl/interface/ftdi/sipeed-rv-debugger.cfg @@ -8,6 +8,6 @@ adapter driver ftdi adapter speed 6000 ftdi device_desc "JTAG Debugger" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi layout_init 0x0008 0x001b ftdi layout_signal nSRST -oe 0x0020 -data 0x0020 diff --git a/tcl/interface/ftdi/sipeed-usb-jtag-debugger.cfg b/tcl/interface/ftdi/sipeed-usb-jtag-debugger.cfg index 8a804eca67..b13bc0bf67 100644 --- a/tcl/interface/ftdi/sipeed-usb-jtag-debugger.cfg +++ b/tcl/interface/ftdi/sipeed-usb-jtag-debugger.cfg @@ -8,7 +8,7 @@ adapter driver ftdi ftdi device_desc "Dual RS232" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi channel 0 # Every pin set as high impedance except TCK, TDI, TDO, TMS and RST diff --git a/tcl/interface/ftdi/snps_sdp.cfg b/tcl/interface/ftdi/snps_sdp.cfg index eb2aecc87a..242c238c28 100644 --- a/tcl/interface/ftdi/snps_sdp.cfg +++ b/tcl/interface/ftdi/snps_sdp.cfg @@ -11,7 +11,7 @@ # adapter driver ftdi -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi layout_init 0x0088 0x008b ftdi channel 1 diff --git a/tcl/interface/ftdi/steppenprobe.cfg b/tcl/interface/ftdi/steppenprobe.cfg index f84efe61ed..28b302eeb6 100644 --- a/tcl/interface/ftdi/steppenprobe.cfg +++ b/tcl/interface/ftdi/steppenprobe.cfg @@ -6,7 +6,7 @@ # adapter driver ftdi -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 # Initial Layout ftdi layout_init 0x0058 0x99fb diff --git a/tcl/interface/ftdi/stm32-stick.cfg b/tcl/interface/ftdi/stm32-stick.cfg index 1d72d20e35..af9d2a8a5a 100644 --- a/tcl/interface/ftdi/stm32-stick.cfg +++ b/tcl/interface/ftdi/stm32-stick.cfg @@ -8,7 +8,7 @@ adapter driver ftdi ftdi device_desc "STM32-PerformanceStick" -ftdi vid_pid 0x0640 0x002d +adapter usb vid_pid 0x0640 0x002d ftdi layout_init 0x0388 0x038b ftdi layout_signal nTRST -data 0x0100 diff --git a/tcl/interface/ftdi/ti-icdi.cfg b/tcl/interface/ftdi/ti-icdi.cfg index 964de76e6a..75b7152aca 100644 --- a/tcl/interface/ftdi/ti-icdi.cfg +++ b/tcl/interface/ftdi/ti-icdi.cfg @@ -9,7 +9,7 @@ # adapter driver ftdi -ftdi vid_pid 0x0451 0xc32a +adapter usb vid_pid 0x0451 0xc32a ftdi layout_init 0x00a8 0x00eb ftdi layout_signal nSRST -noe 0x0020 diff --git a/tcl/interface/ftdi/tigard.cfg b/tcl/interface/ftdi/tigard.cfg index 43ce0ad1d1..f73d26690a 100644 --- a/tcl/interface/ftdi/tigard.cfg +++ b/tcl/interface/ftdi/tigard.cfg @@ -6,7 +6,7 @@ adapter driver ftdi ftdi device_desc "Tigard V1.1" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi channel 1 diff --git a/tcl/interface/ftdi/tumpa-lite.cfg b/tcl/interface/ftdi/tumpa-lite.cfg index e3f12e3b12..1184146dca 100644 --- a/tcl/interface/ftdi/tumpa-lite.cfg +++ b/tcl/interface/ftdi/tumpa-lite.cfg @@ -7,7 +7,7 @@ # adapter driver ftdi -ftdi vid_pid 0x0403 0x8a99 +adapter usb vid_pid 0x0403 0x8a99 ftdi layout_init 0x0038 0x087b ftdi layout_signal nTRST -data 0x0020 -oe 0x0020 diff --git a/tcl/interface/ftdi/tumpa.cfg b/tcl/interface/ftdi/tumpa.cfg index db4311bfe1..b28abe3432 100644 --- a/tcl/interface/ftdi/tumpa.cfg +++ b/tcl/interface/ftdi/tumpa.cfg @@ -7,7 +7,7 @@ # adapter driver ftdi -ftdi vid_pid 0x0403 0x8a98 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x8a98 0x0403 0x6010 ftdi layout_init 0x0038 0x087b ftdi layout_signal nTRST -data 0x0020 diff --git a/tcl/interface/ftdi/turtelizer2-revB.cfg b/tcl/interface/ftdi/turtelizer2-revB.cfg index f90fc58c1b..574c697411 100644 --- a/tcl/interface/ftdi/turtelizer2-revB.cfg +++ b/tcl/interface/ftdi/turtelizer2-revB.cfg @@ -13,7 +13,7 @@ echo "mailing list, so it could be marked as working or fixed." adapter driver ftdi ftdi device_desc "Turtelizer JTAG/RS232 Adapter" -ftdi vid_pid 0x0403 0xbdc8 +adapter usb vid_pid 0x0403 0xbdc8 ftdi layout_init 0x0008 0x0c5b ftdi layout_signal nSRST -oe 0x0040 diff --git a/tcl/interface/ftdi/turtelizer2-revC.cfg b/tcl/interface/ftdi/turtelizer2-revC.cfg index 94617a1dd1..4afd24cac4 100644 --- a/tcl/interface/ftdi/turtelizer2-revC.cfg +++ b/tcl/interface/ftdi/turtelizer2-revC.cfg @@ -8,7 +8,7 @@ adapter driver ftdi ftdi device_desc "Turtelizer JTAG/RS232 Adapter" -ftdi vid_pid 0x0403 0xbdc8 +adapter usb vid_pid 0x0403 0xbdc8 ftdi layout_init 0x0008 0x0c7b ftdi layout_signal nTRST -oe 0x0020 diff --git a/tcl/interface/ftdi/um232h.cfg b/tcl/interface/ftdi/um232h.cfg index 6be08b59cb..657162c0f4 100644 --- a/tcl/interface/ftdi/um232h.cfg +++ b/tcl/interface/ftdi/um232h.cfg @@ -11,7 +11,7 @@ adapter driver ftdi #ftdi device_desc "UM232H" -ftdi vid_pid 0x0403 0x6014 +adapter usb vid_pid 0x0403 0x6014 ftdi layout_init 0xfff8 0xfffb ftdi layout_signal nTRST -data 0x0100 -oe 0x0100 diff --git a/tcl/interface/ftdi/vpaclink.cfg b/tcl/interface/ftdi/vpaclink.cfg index ff508f2dcd..ed8fbcaa80 100644 --- a/tcl/interface/ftdi/vpaclink.cfg +++ b/tcl/interface/ftdi/vpaclink.cfg @@ -14,7 +14,7 @@ echo "as working or fixed." adapter driver ftdi ftdi device_desc "VPACLink" -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 ftdi layout_init 0x0508 0x0f1b ftdi layout_signal nTRST -data 0x0200 -noe 0x0100 diff --git a/tcl/interface/ftdi/xds100v2.cfg b/tcl/interface/ftdi/xds100v2.cfg index 373df4f49b..eed552a6db 100644 --- a/tcl/interface/ftdi/xds100v2.cfg +++ b/tcl/interface/ftdi/xds100v2.cfg @@ -10,7 +10,7 @@ # adapter driver ftdi -ftdi vid_pid 0x0403 0xa6d0 0x0403 0x6010 +adapter usb vid_pid 0x0403 0xa6d0 0x0403 0x6010 ftdi layout_init 0x0038 0x597b diff --git a/tcl/interface/ftdi/xds100v3.cfg b/tcl/interface/ftdi/xds100v3.cfg index dc722336f1..86852510d2 100644 --- a/tcl/interface/ftdi/xds100v3.cfg +++ b/tcl/interface/ftdi/xds100v3.cfg @@ -10,4 +10,4 @@ source [find interface/ftdi/xds100v2.cfg] # The USB ids are different. -ftdi vid_pid 0x0403 0xa6d1 +adapter usb vid_pid 0x0403 0xa6d1 diff --git a/tcl/interface/ftdi/xt_kc705_ml605.cfg b/tcl/interface/ftdi/xt_kc705_ml605.cfg index dda8c0a2b6..13b0e85c96 100644 --- a/tcl/interface/ftdi/xt_kc705_ml605.cfg +++ b/tcl/interface/ftdi/xt_kc705_ml605.cfg @@ -3,7 +3,7 @@ # adapter driver ftdi -ftdi vid_pid 0x0403 0x6010 +adapter usb vid_pid 0x0403 0x6010 # Specify "adapter serial <identifier>" here as needed ftdi layout_init 0x0010 0x007b diff --git a/tcl/interface/microchip/embedded_flashpro5.cfg b/tcl/interface/microchip/embedded_flashpro5.cfg index 117a54458e..a3adf94746 100644 --- a/tcl/interface/microchip/embedded_flashpro5.cfg +++ b/tcl/interface/microchip/embedded_flashpro5.cfg @@ -10,7 +10,7 @@ adapter driver ftdi # vidpid 1514:2008 = embedded flashpro5 # vidpid 1514:200a = pic64gx -ftdi vid_pid 0x1514 0x2008 0x1514 0x200a +adapter usb vid_pid 0x1514 0x2008 0x1514 0x200a # That FTDI has 4 channels (channel 0 and 1 are MPSSE-capable, 2 and 3 are bitbang ftdi channel 0 --
