From: Tomek CEDRO <cederom@tlen.pl>
Date: Thu, 16 Jun 2011 06:54:58 +0000 (+0000)
Subject: ADAPTER: Fixed transport selection mechanism to support transports other than jtag... 
X-Git-Tag: v0.5.0-rc1~18
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=37d5ac6378c306275775b36ad776ba4de6746e10

ADAPTER: Fixed transport selection mechanism to support transports other than jtag (if defined).
---

diff --git a/src/jtag/adapter.c b/src/jtag/adapter.c
index 94843d7d4a..a0cd5e3dab 100644
--- a/src/jtag/adapter.c
+++ b/src/jtag/adapter.c
@@ -47,8 +47,7 @@
  */
 
 extern struct jtag_interface *jtag_interface;
-
-
+const char *jtag_only[] = { "jtag", NULL };
 
 static int
 jim_adapter_name(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
@@ -93,9 +92,6 @@ static int default_srst_asserted(int *srst_asserted)
 	return ERROR_OK;
 }
 
-const char *jtag_only[] = { "jtag", NULL, };
-
-
 COMMAND_HANDLER(interface_transport_command)
 {
 	char **transports;
@@ -169,9 +165,8 @@ COMMAND_HANDLER(handle_interface_command)
 		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);
+		retval = allow_transports(CMD_CTX, jtag_interface->transports
+						? jtag_interface->transports : jtag_only);
 			if (ERROR_OK != retval)
 				return retval;