From 6d3e3dcf3e4cd04289e4b1cf5b2de60ef1734f69 Mon Sep 17 00:00:00 2001 From: Kolja Waschk Date: Sat, 18 Oct 2008 11:10:56 +0000 Subject: [PATCH] Add support for ARM-USB-OCD TINY (Sebastian Hesselbarth) git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1376 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- jtag/ChangeLog | 5 +++++ jtag/THANKS | 1 + jtag/src/tap/cable/ft2232.c | 16 +++++++++++++++- jtag/src/tap/cable/generic_usbconn.c | 4 ++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/jtag/ChangeLog b/jtag/ChangeLog index def7dc8a..43e78fa5 100644 --- a/jtag/ChangeLog +++ b/jtag/ChangeLog @@ -1,3 +1,8 @@ +2008-10-18 Kolja Waschk + + * src/tap/cable/ft2232.c, src/tap/cable/generic_usbconn.c: + Add support for ARM-USB-OCD TINY (Sebastian Hesselbarth) + 2008-10-13 Jie Zhang * src/tap/cable/ft2232.c (ft2232_transfer_schedule): Don't diff --git a/jtag/THANKS b/jtag/THANKS index f003c26a..66089e8a 100644 --- a/jtag/THANKS +++ b/jtag/THANKS @@ -26,6 +26,7 @@ Thomas Fröhlich Mike Frysinger Robin Getz Christophe Grenier +Sebastian Hesselbarth Jiun-Shian Ho Jachym Holecek August Hörandl diff --git a/jtag/src/tap/cable/ft2232.c b/jtag/src/tap/cable/ft2232.c index 78866cc1..a223a7c3 100644 --- a/jtag/src/tap/cable/ft2232.c +++ b/jtag/src/tap/cable/ft2232.c @@ -1408,7 +1408,7 @@ usbconn_cable_t usbconn_cable_ft2232_ftd2xx = { cable_driver_t ft2232_armusbocd_cable_driver = { "ARM-USB-OCD", - N_("Olimex ARM-USB-OCD (FT2232) Cable"), + N_("Olimex ARM-USB-OCD[-TINY] (FT2232) Cable"), ft2232_connect, generic_disconnect, ft2232_cable_free, @@ -1437,6 +1437,20 @@ usbconn_cable_t usbconn_cable_armusbocd_ftd2xx = { 0x15BA, /* VID */ 0x0003 /* PID */ }; +usbconn_cable_t usbconn_cable_armusbocdtiny_ftdi = { + "ARM-USB-OCD", /* cable name */ + NULL, /* string pattern, not used */ + "ftdi-mpsse", /* default usbconn driver */ + 0x15BA, /* VID */ + 0x0004 /* PID */ +}; +usbconn_cable_t usbconn_cable_armusbocdtiny_ftd2xx = { + "ARM-USB-OCD", /* cable name */ + NULL, /* string pattern, not used */ + "ftd2xx-mpsse", /* default usbconn driver */ + 0x15BA, /* VID */ + 0x0004 /* PID */ +}; cable_driver_t ft2232_gnice_cable_driver = { "gnICE", diff --git a/jtag/src/tap/cable/generic_usbconn.c b/jtag/src/tap/cable/generic_usbconn.c index cf198dad..451680e5 100644 --- a/jtag/src/tap/cable/generic_usbconn.c +++ b/jtag/src/tap/cable/generic_usbconn.c @@ -48,6 +48,7 @@ extern usbconn_cable_t usbconn_cable_jlink; #ifdef ENABLE_LOWLEVEL_FTD2XX extern usbconn_cable_t usbconn_cable_ft2232_ftd2xx; extern usbconn_cable_t usbconn_cable_armusbocd_ftd2xx; +extern usbconn_cable_t usbconn_cable_armusbocdtiny_ftd2xx; extern usbconn_cable_t usbconn_cable_gnice_ftd2xx; extern usbconn_cable_t usbconn_cable_jtagkey_ftd2xx; extern usbconn_cable_t usbconn_cable_oocdlinks_ftd2xx; @@ -58,6 +59,7 @@ extern usbconn_cable_t usbconn_cable_signalyzer_ftd2xx; #ifdef ENABLE_LOWLEVEL_FTDI extern usbconn_cable_t usbconn_cable_ft2232_ftdi; extern usbconn_cable_t usbconn_cable_armusbocd_ftdi; +extern usbconn_cable_t usbconn_cable_armusbocdtiny_ftdi; extern usbconn_cable_t usbconn_cable_gnice_ftdi; extern usbconn_cable_t usbconn_cable_jtagkey_ftdi; extern usbconn_cable_t usbconn_cable_oocdlinks_ftdi; @@ -94,6 +96,7 @@ usbconn_cable_t *usbconn_cables[] = #ifdef ENABLE_LOWLEVEL_FTD2XX &usbconn_cable_ft2232_ftd2xx, &usbconn_cable_armusbocd_ftd2xx, + &usbconn_cable_armusbocdtiny_ftd2xx, &usbconn_cable_gnice_ftd2xx, &usbconn_cable_jtagkey_ftd2xx, &usbconn_cable_oocdlinks_ftd2xx, @@ -104,6 +107,7 @@ usbconn_cable_t *usbconn_cables[] = #ifdef ENABLE_LOWLEVEL_FTDI &usbconn_cable_ft2232_ftdi, &usbconn_cable_armusbocd_ftdi, + &usbconn_cable_armusbocdtiny_ftdi, &usbconn_cable_gnice_ftdi, &usbconn_cable_jtagkey_ftdi, &usbconn_cable_oocdlinks_ftdi,