summaryrefslogtreecommitdiff
path: root/src/target/mips_m4k.c
diff options
context:
space:
mode:
authorzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-06-09 08:40:31 +0000
committerzwelch <zwelch@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2009-06-09 08:40:31 +0000
commit6dc2c2ce970863a079f101d84a0c47b37b682c76 (patch)
treef7f4f9ac7691f27ac90a18bb0016899522ff8233 /src/target/mips_m4k.c
parent2a8e37173ad93c6c63aef28e365cc341d4c06fdb (diff)
downloadopenocd_libswd-6dc2c2ce970863a079f101d84a0c47b37b682c76.tar.gz
openocd_libswd-6dc2c2ce970863a079f101d84a0c47b37b682c76.tar.bz2
openocd_libswd-6dc2c2ce970863a079f101d84a0c47b37b682c76.tar.xz
openocd_libswd-6dc2c2ce970863a079f101d84a0c47b37b682c76.zip
Encapsulate jtag_reset_config using accessors:
- Update handle_reset_config_command in tcl.c to use new helpers. - Replace direct accesses in JTAG interface and target drivers. git-svn-id: svn://svn.berlios.de/openocd/trunk@2161 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/target/mips_m4k.c')
-rw-r--r--src/target/mips_m4k.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index 466e0a2d..5e98a2a0 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_get_srst())
+ if ((jtag_get_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;
@@ -267,6 +267,7 @@ int mips_m4k_assert_reset(target_t *target)
LOG_DEBUG("target->state: %s",
Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name);
+ enum reset_types jtag_reset_config = jtag_get_reset_config();
if (!(jtag_reset_config & RESET_HAS_SRST))
{
LOG_ERROR("Can't assert SRST");