summaryrefslogtreecommitdiff
path: root/src/target
diff options
context:
space:
mode:
authordrath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2006-10-23 14:02:34 +0000
committerdrath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2006-10-23 14:02:34 +0000
commit456737b08bbc37d13e4e08fa625413f8b91a6458 (patch)
tree639d8ae1f9e7442f1b69c72e3634047bd751667c /src/target
parente8ead33804f1aede5157a5afc1bc249038799e6b (diff)
downloadopenocd+libswd-456737b08bbc37d13e4e08fa625413f8b91a6458.tar.gz
openocd+libswd-456737b08bbc37d13e4e08fa625413f8b91a6458.tar.bz2
openocd+libswd-456737b08bbc37d13e4e08fa625413f8b91a6458.tar.xz
openocd+libswd-456737b08bbc37d13e4e08fa625413f8b91a6458.zip
- several small fixes (thanks to Magnus Lundin and Spencer Oliver)
- added support for using Luminary Micro development board 'evb_lm3s811' as a JTAG interface (thanks to Magnus Lundin) git-svn-id: svn://svn.berlios.de/openocd/trunk@106 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/target')
-rw-r--r--src/target/arm7_9_common.c8
-rw-r--r--src/target/arm7tdmi.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index b793ba51..c298c904 100644
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -281,15 +281,15 @@ int arm7_9_add_breakpoint(struct target_s *target, u32 address, u32 length, enum
return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
}
- if (type == BKPT_HARD)
- arm7_9->wp_available--;
-
if ((length != 2) && (length != 4))
{
INFO("only breakpoints of two (Thumb) or four (ARM) bytes length supported");
return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
}
+ if (type == BKPT_HARD)
+ arm7_9->wp_available--;
+
return ERROR_OK;
}
@@ -1448,7 +1448,7 @@ int arm7_9_step(struct target_s *target, int current, u32 address, int handle_br
{
armv4_5_common_t *armv4_5 = target->arch_info;
arm7_9_common_t *arm7_9 = armv4_5->arch_info;
- breakpoint_t *breakpoint = target->breakpoints;
+ breakpoint_t *breakpoint = NULL;
if (target->state != TARGET_HALTED)
{
diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c
index 11595244..a1fde037 100644
--- a/src/target/arm7tdmi.c
+++ b/src/target/arm7tdmi.c
@@ -869,7 +869,7 @@ int arm7tdmi_target_command(struct command_context_s *cmd_ctx, char *cmd, char *
exit(-1);
}
- chain_pos = strtoul(args[2], NULL, 0);
+ chain_pos = strtoul(args[3], NULL, 0);
if (argc >= 5)
variant = args[4];