From 45a528ff3c0582f7d22b65d76d925f34a6956957 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Thu, 4 Mar 2010 21:51:58 -0800 Subject: rename "swjdp_common" as "adiv5_dap" This partially corrects an inappropriate name choice (and its associated FIXME). There are still too many variables named "swjdp", bug little current code actually relies on them referencing an SWJ-DP instead of some other flavor of DAP. Only the two new dap_to{swd,jtag}() calls could behave differently on an SWJ-DP instead of a SW-DP or a JTAG-DP. Signed-off-by: David Brownell --- src/target/armv7m.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/target/armv7m.c') diff --git a/src/target/armv7m.c b/src/target/armv7m.c index 65e03bf6..5276af88 100644 --- a/src/target/armv7m.c +++ b/src/target/armv7m.c @@ -755,7 +755,7 @@ COMMAND_HANDLER(handle_dap_baseaddr_command) { struct target *target = get_current_target(CMD_CTX); struct armv7m_common *armv7m = target_to_armv7m(target); - struct swjdp_common *swjdp = &armv7m->swjdp_info; + struct adiv5_dap *swjdp = &armv7m->swjdp_info; if (!is_armv7m(armv7m)) { command_print(CMD_CTX, "current target isn't an ARM7-M"); @@ -773,7 +773,7 @@ COMMAND_HANDLER(handle_dap_apid_command) { struct target *target = get_current_target(CMD_CTX); struct armv7m_common *armv7m = target_to_armv7m(target); - struct swjdp_common *swjdp = &armv7m->swjdp_info; + struct adiv5_dap *swjdp = &armv7m->swjdp_info; if (!is_armv7m(armv7m)) { command_print(CMD_CTX, "current target isn't an ARM7-M"); @@ -787,7 +787,7 @@ COMMAND_HANDLER(handle_dap_apsel_command) { struct target *target = get_current_target(CMD_CTX); struct armv7m_common *armv7m = target_to_armv7m(target); - struct swjdp_common *swjdp = &armv7m->swjdp_info; + struct adiv5_dap *swjdp = &armv7m->swjdp_info; if (!is_armv7m(armv7m)) { command_print(CMD_CTX, "current target isn't an ARM7-M"); @@ -801,7 +801,7 @@ COMMAND_HANDLER(handle_dap_memaccess_command) { struct target *target = get_current_target(CMD_CTX); struct armv7m_common *armv7m = target_to_armv7m(target); - struct swjdp_common *swjdp = &armv7m->swjdp_info; + struct adiv5_dap *swjdp = &armv7m->swjdp_info; if (!is_armv7m(armv7m)) { command_print(CMD_CTX, "current target isn't an ARM7-M"); @@ -816,7 +816,7 @@ COMMAND_HANDLER(handle_dap_info_command) { struct target *target = get_current_target(CMD_CTX); struct armv7m_common *armv7m = target_to_armv7m(target); - struct swjdp_common *swjdp = &armv7m->swjdp_info; + struct adiv5_dap *swjdp = &armv7m->swjdp_info; uint32_t apsel; if (!is_armv7m(armv7m)) { -- cgit v1.2.3