summaryrefslogtreecommitdiff
path: root/src/target/armv7m.c
diff options
context:
space:
mode:
authorDavid Brownell <dbrownell@users.sourceforge.net>2010-03-04 21:51:58 -0800
committerDavid Brownell <dbrownell@users.sourceforge.net>2010-03-04 21:51:58 -0800
commit45a528ff3c0582f7d22b65d76d925f34a6956957 (patch)
treebf3884b3b85c2f15f29b5fb5f94dc12159bfa3f8 /src/target/armv7m.c
parent5e78ddcea0d8303c316f687c05dfa78af27109d8 (diff)
downloadopenocd+libswd-45a528ff3c0582f7d22b65d76d925f34a6956957.tar.gz
openocd+libswd-45a528ff3c0582f7d22b65d76d925f34a6956957.tar.bz2
openocd+libswd-45a528ff3c0582f7d22b65d76d925f34a6956957.tar.xz
openocd+libswd-45a528ff3c0582f7d22b65d76d925f34a6956957.zip
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 <dbrownell@users.sourceforge.net>
Diffstat (limited to 'src/target/armv7m.c')
-rw-r--r--src/target/armv7m.c10
1 files changed, 5 insertions, 5 deletions
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)) {