aboutsummaryrefslogtreecommitdiff
path: root/src/target/arm_dap.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/target/arm_dap.c')
-rw-r--r--src/target/arm_dap.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/target/arm_dap.c b/src/target/arm_dap.c
index fbcfe0d..56442f1 100644
--- a/src/target/arm_dap.c
+++ b/src/target/arm_dap.c
@@ -34,7 +34,7 @@ static LIST_HEAD(all_dap);
extern const struct dap_ops swd_dap_ops;
extern const struct dap_ops jtag_dp_ops;
-extern struct jtag_interface *jtag_interface;
+extern struct adapter_driver *adapter_driver;
/* DAP command support */
struct arm_dap_object {
@@ -59,6 +59,7 @@ static void dap_instance_init(struct adiv5_dap *dap)
dap->ap[i].csw_default = CSW_AHB_DEFAULT;
}
INIT_LIST_HEAD(&dap->cmd_journal);
+ INIT_LIST_HEAD(&dap->cmd_pool);
}
const char *adiv5_dap_name(struct adiv5_dap *self)
@@ -117,7 +118,11 @@ static int dap_init_all(void)
if (transport_is_swd()) {
dap->ops = &swd_dap_ops;
- obj->swd = jtag_interface->swd;
+ obj->swd = adapter_driver->swd_ops;
+ } else if (transport_is_dapdirect_swd()) {
+ dap->ops = adapter_driver->dap_swd_ops;
+ } else if (transport_is_dapdirect_jtag()) {
+ dap->ops = adapter_driver->dap_jtag_ops;
} else
dap->ops = &jtag_dp_ops;