summaryrefslogtreecommitdiff
path: root/src/target
diff options
context:
space:
mode:
authorzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-06-09 08:39:50 +0000
committerzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-06-09 08:39:50 +0000
commit175867ea323137285a5389fc6a65105c06853651 (patch)
tree454437dfdaa592d7d7c01738fc94a57f4e3bad7b /src/target
parent92a102c2d5c59592458b5fcd23d0eeb34eb47141 (diff)
downloadopenocd+libswd-175867ea323137285a5389fc6a65105c06853651.tar.gz
openocd+libswd-175867ea323137285a5389fc6a65105c06853651.tar.bz2
openocd+libswd-175867ea323137285a5389fc6a65105c06853651.tar.xz
openocd+libswd-175867ea323137285a5389fc6a65105c06853651.zip
Encapsulate the jtag_trst and jtag_srst variables:
- Add accessor functions to return their value. - Use new SRST accessor in cortex_m3.c and mips_m4k.c git-svn-id: svn://svn.berlios.de/openocd/trunk@2157 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/target')
-rw-r--r--src/target/cortex_m3.c2
-rw-r--r--src/target/mips_m4k.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c
index d105fe33..efa94ea4 100644
--- a/src/target/cortex_m3.c
+++ b/src/target/cortex_m3.c
@@ -544,7 +544,7 @@ int cortex_m3_halt(target_t *target)
if (target->state == TARGET_RESET)
{
- if ((jtag_reset_config & RESET_SRST_PULLS_TRST) && jtag_srst)
+ if ((jtag_reset_config & RESET_SRST_PULLS_TRST) && jtag_get_srst())
{
LOG_ERROR("can't request a halt while in reset if nSRST pulls nTRST");
return ERROR_TARGET_FAILURE;
diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index d69a0a0a..466e0a2d 100644
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -235,7 +235,7 @@ int mips_m4k_halt(struct target_s *target)
if (target->state == TARGET_RESET)
{
- if ((jtag_reset_config & RESET_SRST_PULLS_TRST) && jtag_srst)
+ if ((jtag_reset_config & RESET_SRST_PULLS_TRST) && jtag_get_srst())
{
LOG_ERROR("can't request a halt while in reset if nSRST pulls nTRST");
return ERROR_TARGET_FAILURE;