target/arm: Remove usage of struct arm_jtag in ARMv7 targets

[openocd.git] / src / target / cortex_m.c

diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index f8a513265c93d3c147493fea09c0668e6d2ca103..ec5caa288fe1a67c412970dc9091f8276033b8c9 100644 (file)
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -2104,7 +2104,6 @@ static int cortex_m_handle_target_request(void *priv)
 static int cortex_m_init_arch_info(struct target *target,
        struct cortex_m_common *cortex_m, struct jtag_tap *tap)
 {
-       int retval;
        struct armv7m_common *armv7m = &cortex_m->armv7m;
 
        armv7m_init_arch_info(target, armv7m);
@@ -2113,12 +2112,8 @@ static int cortex_m_init_arch_info(struct target *target,
        if (!tap->dap) {
                tap->dap = dap_init();
 
-               /* prepare JTAG information for the new target */
-               cortex_m->jtag_info.tap = tap;
-               cortex_m->jtag_info.scann_size = 4;
-
                /* Leave (only) generic DAP stuff for debugport_init() */
-               tap->dap->jtag_info = &cortex_m->jtag_info;
+               tap->dap->tap = tap;
        }
 
        /* default reset mode is to use srst if fitted
@@ -2142,10 +2137,6 @@ static int cortex_m_init_arch_info(struct target *target,
 
        target_register_timer_callback(cortex_m_handle_target_request, 1, 1, target);
 
-       retval = arm_jtag_setup_connection(&cortex_m->jtag_info);
-       if (retval != ERROR_OK)
-               return retval;
-
        return ERROR_OK;
 }