adapter: use bitmask for driver's transports

In every driver, replace the array of strings with a bitmask that
lists the supported transports.
Add an extra field to carry the former first listed transport as a
"preferred" transport. It would be used as default when no command
'transport select' is used. This keeps backward compatibility with
scripts that do not define the transport, relying on such default.

Change-Id: I4976583f1a38fdcc1f85045023dc7c629001f743
Signed-off-by: Antonio Borneo <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/8675
Tested-by: jenkins
Reviewed-by: zapb <[email protected]>

Author: borneoa

src/jtag/adapter.c

@@ -16,6 +16,7 @@
 #include "minidriver.h"
 #include "interface.h"
 #include "interfaces.h"
+#include <helper/bits.h>
 #include <transport/transport.h>
 
 /**
@@ -24,7 +25,6 @@
  */
 
 struct adapter_driver *adapter_driver;
-const char * const jtag_only[] = { "jtag", NULL };
 
 enum adapter_clk_mode {
 	CLOCK_MODE_UNSELECTED = 0,
@@ -402,11 +402,12 @@ COMMAND_HANDLER(dump_adapter_driver_list)
 
 	for (unsigned int i = 0; adapter_drivers[i]; i++) {
 		const char *name = adapter_drivers[i]->name;
-		const char * const *transports = adapter_drivers[i]->transports;
+		unsigned int transport_ids = adapter_drivers[i]->transport_ids;
 
 		command_print_sameline(CMD, "%-*s {", max_len, name);
-		for (unsigned int j = 0; transports[j]; j++)
-			command_print_sameline(CMD, " %s", transports[j]);
+		for (unsigned int j = BIT(0); j & TRANSPORT_VALID_MASK; j <<= 1)
+			if (j & transport_ids)
+				command_print_sameline(CMD, " %s", transport_name(j));
 		command_print(CMD, " }");
 	}
 
@@ -447,7 +448,8 @@ COMMAND_HANDLER(handle_adapter_driver_command)
 
 		adapter_driver = adapter_drivers[i];
 
-		return allow_transports(CMD_CTX, adapter_driver->transports);
+		return allow_transports(CMD_CTX, adapter_driver->transport_ids,
+			adapter_driver->transport_preferred_id);
 	}
 
 	/* no valid adapter driver was found (i.e. the configuration option,

src/jtag/drivers/am335xgpio.c

@@ -350,8 +350,6 @@ static const struct command_registration am335xgpio_command_handlers[] = {
 	COMMAND_REGISTRATION_DONE
 };
 
-static const char * const am335xgpio_transports[] = { "jtag", "swd", NULL };
-
 static struct jtag_interface am335xgpio_interface = {
 	.supported = DEBUG_CAP_TMS_SEQ,
 	.execute_queue = bitbang_execute_queue,
@@ -494,7 +492,8 @@ static int am335xgpio_quit(void)
 
 struct adapter_driver am335xgpio_adapter_driver = {
 	.name = "am335xgpio",
-	.transports = am335xgpio_transports,
+	.transport_ids = TRANSPORT_JTAG | TRANSPORT_SWD,
+	.transport_preferred_id = TRANSPORT_JTAG,
 	.commands = am335xgpio_command_handlers,
 
 	.init = am335xgpio_init,

src/jtag/drivers/amt_jtagaccel.c

@@ -579,7 +579,8 @@ static struct jtag_interface amt_jtagaccel_interface = {
 
 struct adapter_driver amt_jtagaccel_adapter_driver = {
 	.name = "amt_jtagaccel",
-	.transports = jtag_only,
+	.transport_ids = TRANSPORT_JTAG,
+	.transport_preferred_id = TRANSPORT_JTAG,
 	.commands = amtjtagaccel_command_handlers,
 
 	.init = amt_jtagaccel_init,

src/jtag/drivers/angie.c

@@ -2388,7 +2388,8 @@ static struct jtag_interface angie_interface = {
 
 struct adapter_driver angie_adapter_driver = {
 	.name = "angie",
-	.transports = jtag_only,
+	.transport_ids = TRANSPORT_JTAG,
+	.transport_preferred_id = TRANSPORT_JTAG,
 
 	.init = angie_init,
 	.quit = angie_quit,

src/jtag/drivers/arm-jtag-ew.c

@@ -486,7 +486,8 @@ static struct jtag_interface armjtagew_interface = {
 
 struct adapter_driver armjtagew_adapter_driver = {
 	.name = "arm-jtag-ew",
-	.transports = jtag_only,
+	.transport_ids = TRANSPORT_JTAG,
+	.transport_preferred_id = TRANSPORT_JTAG,
 	.commands = armjtagew_command_handlers,
 
 	.init = armjtagew_init,

src/jtag/drivers/at91rm9200.c

@@ -186,7 +186,8 @@ static struct jtag_interface at91rm9200_interface = {
 
 struct adapter_driver at91rm9200_adapter_driver = {
 	.name = "at91rm9200",
-	.transports = jtag_only,
+	.transport_ids = TRANSPORT_JTAG,
+	.transport_preferred_id = TRANSPORT_JTAG,
 	.commands = at91rm9200_command_handlers,
 
 	.init = at91rm9200_init,

src/jtag/drivers/bcm2835gpio.c

@@ -590,15 +590,14 @@ static int bcm2835gpio_quit(void)
 }
 
 
-static const char * const bcm2835_transports[] = { "jtag", "swd", NULL };
-
 static struct jtag_interface bcm2835gpio_interface = {
 	.supported = DEBUG_CAP_TMS_SEQ,
 	.execute_queue = bitbang_execute_queue,
 };
 struct adapter_driver bcm2835gpio_adapter_driver = {
 	.name = "bcm2835gpio",
-	.transports = bcm2835_transports,
+	.transport_ids = TRANSPORT_JTAG | TRANSPORT_SWD,
+	.transport_preferred_id = TRANSPORT_JTAG,
 	.commands = bcm2835gpio_command_handlers,
 
 	.init = bcm2835gpio_init,

src/jtag/drivers/buspirate.c

@@ -534,15 +534,14 @@ static const struct swd_driver buspirate_swd = {
 	.run = buspirate_swd_run_queue,
 };
 
-static const char * const buspirate_transports[] = { "jtag", "swd", NULL };
-
 static struct jtag_interface buspirate_interface = {
 	.execute_queue = buspirate_execute_queue,
 };
 
 struct adapter_driver buspirate_adapter_driver = {
 	.name = "buspirate",
-	.transports = buspirate_transports,
+	.transport_ids = TRANSPORT_JTAG | TRANSPORT_SWD,
+	.transport_preferred_id = TRANSPORT_JTAG,
 	.commands = buspirate_command_handlers,
 
 	.init = buspirate_init,

src/jtag/drivers/cmsis_dap.c

@@ -2314,16 +2314,15 @@ static const struct swd_driver cmsis_dap_swd_driver = {
 	.run = cmsis_dap_swd_run_queue,
 };
 
-static const char * const cmsis_dap_transport[] = { "swd", "jtag", NULL };
-
 static struct jtag_interface cmsis_dap_interface = {
 	.supported = DEBUG_CAP_TMS_SEQ,
 	.execute_queue = cmsis_dap_execute_queue,
 };
 
 struct adapter_driver cmsis_dap_adapter_driver = {
 	.name = "cmsis-dap",
-	.transports = cmsis_dap_transport,
+	.transport_ids = TRANSPORT_SWD | TRANSPORT_JTAG,
+	.transport_preferred_id = TRANSPORT_SWD,
 	.commands = cmsis_dap_command_handlers,
 
 	.init = cmsis_dap_init,

src/jtag/drivers/dmem.c

@@ -604,11 +604,10 @@ static const struct dap_ops dmem_dap_ops = {
 	.run = dmem_dp_run,
 };
 
-static const char *const dmem_dap_transport[] = { "dapdirect_swd", NULL };
-
 struct adapter_driver dmem_dap_adapter_driver = {
 	.name = "dmem",
-	.transports = dmem_dap_transport,
+	.transport_ids = TRANSPORT_DAPDIRECT_SWD,
+	.transport_preferred_id = TRANSPORT_DAPDIRECT_SWD,
 	.commands = dmem_dap_command_handlers,
 
 	.init = dmem_dap_init,