From: David B. <dbr...@us...> - 2010-01-04 00:15:25
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Main OpenOCD repository". The branch, master has been updated via 237a707f9653d7ca8a1ec550b497e9a8d0ce0311 (commit) via e1258c703bf9e6a0868f4d9e939c4be77567c53e (commit) via 50fb3a512931586cc689ac8c36fb3b6832dc0c5a (commit) from 4aedb02fcd4a16d77caeab8f6a3cf505ce9a93bf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 237a707f9653d7ca8a1ec550b497e9a8d0ce0311 Author: David Brownell <dbr...@us...> Date: Sun Jan 3 15:02:51 2010 -0800 FT2232: fix doc typo Signed-off-by: David Brownell <dbr...@us...> diff --git a/src/jtag/drivers/ft2232.c b/src/jtag/drivers/ft2232.c index e9eba54..82132d3 100644 --- a/src/jtag/drivers/ft2232.c +++ b/src/jtag/drivers/ft2232.c @@ -33,7 +33,7 @@ * popular low cost JTAG debug solutions. Many FT2232 based JTAG adapters * are discrete, but development boards may integrate them as alternatives * to more capable (and expensive) third party JTAG pods. Since JTAG uses - * only one of the two parts on these devices, on integrated boards the + * only one of the two ports on these devices, on integrated boards the * second port often serves as a USB-to-serial adapter for the target's * console UART even when the JTAG port is not in use. (Systems which * support ARM's SWD in addition to JTAG, or instead of it, may use that commit e1258c703bf9e6a0868f4d9e939c4be77567c53e Author: David Brownell <dbr...@us...> Date: Sun Jan 3 14:54:52 2010 -0800 JTAG/drivers: ft2232 docs Add doxyegen description for this driver. Correct the helptext (configures *or* displays based on #params), and usage (use the same BNF as the User's Guide). Remove superfluous #include Signed-off-by: David Brownell <dbr...@us...> diff --git a/src/jtag/drivers/ft2232.c b/src/jtag/drivers/ft2232.c index a3ac142..e9eba54 100644 --- a/src/jtag/drivers/ft2232.c +++ b/src/jtag/drivers/ft2232.c @@ -27,13 +27,40 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -/* This code uses information contained in the MPSSE specification which was +/** + * @file + * JTAG adapters based on the FT2232 full and high speed USB parts are + * popular low cost JTAG debug solutions. Many FT2232 based JTAG adapters + * are discrete, but development boards may integrate them as alternatives + * to more capable (and expensive) third party JTAG pods. Since JTAG uses + * only one of the two parts on these devices, on integrated boards the + * second port often serves as a USB-to-serial adapter for the target's + * console UART even when the JTAG port is not in use. (Systems which + * support ARM's SWD in addition to JTAG, or instead of it, may use that + * second port for reading SWV trace data.) + * + * FT2232 based JTAG adapters are "dumb" not "smart", because most JTAG + * request/response interactions involve round trips over the USB link. + * A "smart" JTAG adapter has intelligence close to the scan chain, so it + * can for example poll quickly for a status change (usually taking on the + * order of microseconds not milliseconds) before beginning a queued + * transaction which require the previous one to have completed. + * + * There are dozens of adapters of this type, differing in details which + * this driver needs to understand. Those "layout" details are required + * as part of FT2232 driver configuration. + * + * This code uses information contained in the MPSSE specification which was * found here: * http://www.ftdichip.com/Documents/AppNotes/AN2232C-01_MPSSE_Cmnd.pdf * Hereafter this is called the "MPSSE Spec". * * The datasheet for the ftdichip.com's FT2232D part is here: * http://www.ftdichip.com/Documents/DataSheets/DS_FT2232D.pdf + * + * Also note the issue with code 0x4b (clock data to TMS) noted in + * http://developer.intra2net.com/mailarchive/html/libftdi/2009/msg00292.html + * which can affect longer JTAG state paths. */ #ifdef HAVE_CONFIG_H @@ -42,7 +69,6 @@ /* project specific includes */ #include <jtag/interface.h> -#include <jtag/commands.h> #include <helper/time_support.h> #if IS_CYGWIN == 1 @@ -3983,14 +4009,14 @@ static const struct command_registration ft2232_command_handlers[] = { .handler = &ft2232_handle_device_desc_command, .mode = COMMAND_CONFIG, .help = "set the USB device description of the FTDI FT2232 device", - .usage = "<description>", + .usage = "description_string", }, { .name = "ft2232_serial", .handler = &ft2232_handle_serial_command, .mode = COMMAND_CONFIG, .help = "set the serial number of the FTDI FT2232 device", - .usage = "<serial#>", + .usage = "serial_string", }, { .name = "ft2232_layout", @@ -3998,21 +4024,21 @@ static const struct command_registration ft2232_command_handlers[] = { .mode = COMMAND_CONFIG, .help = "set the layout of the FT2232 GPIO signals used " "to control output-enables and reset signals", - .usage = "<layout>", + .usage = "layout_name", }, { .name = "ft2232_vid_pid", .handler = &ft2232_handle_vid_pid_command, .mode = COMMAND_CONFIG, .help = "the vendor ID and product ID of the FTDI FT2232 device", - .usage = "<vid> <pid> [...]", + .usage = "(vid pid)* ", }, { .name = "ft2232_latency", .handler = &ft2232_handle_latency_command, .mode = COMMAND_CONFIG, .help = "set the FT2232 latency timer to a new value", - .usage = "<vid> <pid> [...]", + .usage = "value", }, COMMAND_REGISTRATION_DONE }; commit 50fb3a512931586cc689ac8c36fb3b6832dc0c5a Author: David Brownell <dbr...@us...> Date: Sun Jan 3 14:51:01 2010 -0800 JTAG/Drivers: Amontec JTAG accelerator fixes Remove superfluous #include. Correct the helptext (configures *or* displays based on #params), and usage (use the same BNF as the User's Guide). Add doxygen -- file-level description and a @todo for doing RTCK correctly. Signed-off-by: David Brownell <dbr...@us...> diff --git a/src/jtag/drivers/amt_jtagaccel.c b/src/jtag/drivers/amt_jtagaccel.c index 974761e..121649b 100644 --- a/src/jtag/drivers/amt_jtagaccel.c +++ b/src/jtag/drivers/amt_jtagaccel.c @@ -22,8 +22,6 @@ #endif #include <jtag/interface.h> -#include <jtag/commands.h> - #if PARPORT_USE_PPDEV == 1 #include <linux/parport.h> @@ -41,6 +39,15 @@ #endif #endif +/** + * @file + * Support the Amontec Chameleon POD with JTAG Accelerator support. + * This is a parallel port JTAG adapter with a CPLD between the + * parallel port and the JTAG connection. VHDL code running in the + * CPLD significantly accelerates JTAG operations compared to the + * bitbanging "Wiggler" style of most parallel port adapters. + */ + /* configuration */ static uint16_t amt_jtagaccel_port; @@ -573,15 +580,21 @@ static const struct command_registration amtjtagaccel_command_handlers[] = { .name = "parport_port", .handler = &amt_jtagaccel_handle_parport_port_command, .mode = COMMAND_CONFIG, - .help = "configure the parallel port to use", - .usage = "<port_num>", + .help = "configure or display the parallel port to use", + .usage = "[port_num]", }, { + /** + * @todo Remove this "rtck" command; just use the standard + * mechanism to enable/disable adaptive clocking. First + * implement the standard mechanism and deprecate "rtck"; + * after a year or so, it'll be safe to remove this. + */ .name = "rtck", .handler = &amt_jtagaccel_handle_rtck_command, .mode = COMMAND_CONFIG, - .help = "enable RTCK", - .usage = "<enable|disable>", + .help = "configure or display RTCK support", + .usage = "[enable|disable]", }, COMMAND_REGISTRATION_DONE }; ----------------------------------------------------------------------- Summary of changes: src/jtag/drivers/amt_jtagaccel.c | 25 ++++++++++++++++++----- src/jtag/drivers/ft2232.c | 40 +++++++++++++++++++++++++++++++------ 2 files changed, 52 insertions(+), 13 deletions(-) hooks/post-receive -- Main OpenOCD repository |