auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

transport selection tweaks

Browse Source 
* Bugfix and simplify legacy jtag-only defaulting
* Make "dummy" declare its jtag-only nature
* likewise update ft2232
* warn if selection is _required_ (multi-transport adapters),

fixes the "only ft2232 works" bug for at least dummy, with
other drivers going the "legacy" path (submit patches).

Signed-off-by: David Brownell <db@helium.(none)>
This commit is contained in:
David Brownell
2010-07-09 18:34:31 -04:00
committed by David Brownell
parent ac5ad4ad8d
commit e8445c9c9f
5 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/jtag/adapter.c
View File

@@ -93,6 +93,9 @@ static int default_srst_asserted(int *srst_asserted)
return ERROR_OK;
}
const char *jtag_only[] = { "jtag", NULL, };
COMMAND_HANDLER(interface_transport_command)
{
char **transports;
@@ -130,6 +133,8 @@ COMMAND_HANDLER(handle_interface_list_command)
COMMAND_HANDLER(handle_interface_command)
{
int retval;
/* check whether the interface is already configured */
if (jtag_interface)
{
@@ -148,7 +153,7 @@ COMMAND_HANDLER(handle_interface_command)
if (NULL != jtag_interfaces[i]->commands)
{
int retval = register_commands(CMD_CTX, NULL,
retval = register_commands(CMD_CTX, NULL,
jtag_interfaces[i]->commands);
if (ERROR_OK != retval)
return retval;
@@ -156,6 +161,20 @@ COMMAND_HANDLER(handle_interface_command)
jtag_interface = jtag_interfaces[i];
/* LEGACY SUPPORT ... adapter drivers must declare what
* transports they allow. Until they all do so, assume
* the legacy drivers are JTAG-only
*/
if (!jtag_interface->transports)
LOG_WARNING("Adapter driver '%s' did not declare "
"which transports it allows; assuming"
"legacy JTAG-only", jtag_interface->name);
retval = allow_transports(CMD_CTX,
jtag_interface->transports
? : jtag_only);
if (ERROR_OK != retval)
return retval;
if (jtag_interface->khz == NULL)
jtag_interface->khz = default_khz;
if (jtag_interface->speed_div == NULL)
@@ -171,7 +190,8 @@ COMMAND_HANDLER(handle_interface_command)
/* no valid interface was found (i.e. the configuration option,
* didn't match one of the compiled-in interfaces
*/
LOG_ERROR("The specified debug interface was not found (%s)", CMD_ARGV[0]);
LOG_ERROR("The specified debug interface was not found (%s)",
CMD_ARGV[0]);
CALL_COMMAND_HANDLER(handle_interface_list_command);
return ERROR_JTAG_INVALID_INTERFACE;
}