summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMariano Alvira <mar@devl.org>2010-02-25 00:01:55 -0800
committerDavid Brownell <dbrownell@users.sourceforge.net>2010-02-25 00:01:55 -0800
commit4a64820f230a267b1f2e36d4be567074e5b8cb76 (patch)
tree06e1de5f6acfd9fad41eee15a17cef2fd0de66c4
parent79010bf3dfad01ff11b37a9a6c79452a604c596d (diff)
downloadopenocd_libswd-4a64820f230a267b1f2e36d4be567074e5b8cb76.tar.gz
openocd_libswd-4a64820f230a267b1f2e36d4be567074e5b8cb76.tar.bz2
openocd_libswd-4a64820f230a267b1f2e36d4be567074e5b8cb76.tar.xz
openocd_libswd-4a64820f230a267b1f2e36d4be567074e5b8cb76.zip
ft2232: add a mechanism to specify channel in layout structs
FT2232-family chips have two or more MPSSE modules. FTDI documentation calls these channels. JTAG adapter drivers thus need to be able to choose which channel to use. (For example, one channel may connect to a board's microcontroller, while another connects to a CPLD.) Since each channel has its own USB interface, libftdi (somewhat confusingly) identifies channels using INTERFACE_* symbols. Most boards use INTERFACE_A for JTAG, which is the default in OpenOCD. But some wire up a different one. Note that there are two facets of what makes a wiring "layout": - The mapping between debug signals map and channel signals ... embedded in C functions. - Label used in Tcl configuration scripts ... part of the "layout" structure. By letting the channel be part of the layout struct, we permit sharing the C functions between Tcl-visible layouts, when those signal mappings are reused. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
-rw-r--r--src/jtag/drivers/ft2232.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/jtag/drivers/ft2232.c b/src/jtag/drivers/ft2232.c
index 5042a22e..4b84fa83 100644
--- a/src/jtag/drivers/ft2232.c
+++ b/src/jtag/drivers/ft2232.c
@@ -145,6 +145,7 @@ struct ft2232_layout {
int (*init)(void);
void (*reset)(int trst, int srst);
void (*blink)(void);
+ int channel;
};
/* init procedures for supported layouts */
@@ -2062,7 +2063,7 @@ static int ft2232_purge_ftd2xx(void)
#endif /* BUILD_FT2232_FTD2XX == 1 */
#if BUILD_FT2232_LIBFTDI == 1
-static int ft2232_init_libftdi(uint16_t vid, uint16_t pid, int more, int* try_more)
+static int ft2232_init_libftdi(uint16_t vid, uint16_t pid, int more, int* try_more, int channel)
{
uint8_t latency_timer;
@@ -2072,7 +2073,10 @@ static int ft2232_init_libftdi(uint16_t vid, uint16_t pid, int more, int* try_mo
if (ftdi_init(&ftdic) < 0)
return ERROR_JTAG_INIT_FAILED;
- if (ftdi_set_interface(&ftdic, INTERFACE_A) < 0)
+ /* default to INTERFACE_A */
+ if(channel == INTERFACE_ANY) { channel = INTERFACE_A; }
+
+ if (ftdi_set_interface(&ftdic, channel) < 0)
{
LOG_ERROR("unable to select FT2232 channel A: %s", ftdic.error_str);
return ERROR_JTAG_INIT_FAILED;
@@ -2197,7 +2201,7 @@ static int ft2232_init(void)
more, &try_more);
#elif BUILD_FT2232_LIBFTDI == 1
retval = ft2232_init_libftdi(ft2232_vid[i], ft2232_pid[i],
- more, &try_more);
+ more, &try_more, cur_layout->channel);
#endif
if (retval >= 0)
break;