Skip to content
This repository was archived by the owner on Mar 7, 2026. It is now read-only.

Commit 6640315

Browse files
committed
hosted/ftdi: Block-move "arm-usb-ocd" below "arm-usb-ocd-h", add FS "arm-usb-tiny"
* 15b1:0003 "olimex" is the original "Olimex OpenOCD JTAG" aka ARM-USB-OCD, so give it a specific name and reference its usermanual by hyperlinks. Add description string. This seems to be a full prefix of 3 others, so make it the last entry. * 15b1:0004 also exists, it's Olimex OpenOCD JTAG TINY" aka ARM-USB-TINY, the unbuffered version. No reason to omit support for it.
1 parent 4de0976 commit 6640315

1 file changed

Lines changed: 26 additions & 7 deletions

File tree

src/platforms/hosted/ftdi_bmp.c

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -187,13 +187,6 @@ const cable_desc_s cable_desc[] = {
187187
.name = "ftdiswd",
188188
.description = "FTDISWD",
189189
},
190-
{
191-
.vendor = 0x15b1U,
192-
.product = 0x0003U,
193-
.interface = INTERFACE_A,
194-
.init.dirs[0] = PIN5,
195-
.name = "olimex",
196-
},
197190
{
198191
/*
199192
* Buffered connection from FTDI to JTAG/SWD.
@@ -380,6 +373,32 @@ const cable_desc_s cable_desc[] = {
380373
.name = "arm-usb-tiny-h",
381374
.description = "Olimex OpenOCD JTAG ARM-USB-TINY-H",
382375
},
376+
{
377+
/*
378+
* https://www.olimex.com/Products/ARM/JTAG/_resources/ARM-USB-TINY_and_TINY_H_manual.pdf
379+
* JTAG-only, unbuffered.
380+
*/
381+
.vendor = 0x15baU,
382+
.product = 0x0004U,
383+
.interface = INTERFACE_A,
384+
.description = "Olimex OpenOCD JTAG TINY",
385+
.name = "arm-usb-tiny",
386+
},
387+
{
388+
/*
389+
* https://www.olimex.com/Products/ARM/JTAG/_resources/ARM-USB-OCD.pdf
390+
* https://www.olimex.com/Products/ARM/JTAG/_resources/ARM-USB-OCD_and_OCD_H_manual.pdf
391+
* DBUS 4 (active-low) enables output buffers.
392+
* DBUS 6 is TSRST in (sense), CBUS 1 is TSRST out.
393+
* CBUS 0 is TRST, CBUS 2 is TRST buffer-enable. CBUS 3 is red LED.
394+
*/
395+
.vendor = 0x15baU,
396+
.product = 0x0003U,
397+
.interface = INTERFACE_A,
398+
.init.dirs[0] = PIN4,
399+
.description = "Olimex OpenOCD JTAG",
400+
.name = "arm-usb-ocd",
401+
},
383402
{0},
384403
};
385404

0 commit comments

Comments
 (0)