summaryrefslogtreecommitdiff
path: root/src/target/feroceon.c
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-08-05 06:18:26 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-08-05 06:18:26 +0000
commit3a4896182036eb472a06f66be3710d5c228b6748 (patch)
treeaa1207bc7952af699ead708f5f669fed53a20a47 /src/target/feroceon.c
parente4729b3b7a5cfa30c19da4be7babfc074616fac6 (diff)
downloadopenocd+libswd-3a4896182036eb472a06f66be3710d5c228b6748.tar.gz
openocd+libswd-3a4896182036eb472a06f66be3710d5c228b6748.tar.bz2
openocd+libswd-3a4896182036eb472a06f66be3710d5c228b6748.tar.xz
openocd+libswd-3a4896182036eb472a06f66be3710d5c228b6748.zip
moves handling of problems with resetting into the halted state
into the target implementation. Also target_process_reset() is now simpler and has error handling, e.g. if assert reset fails, then target_process_reset() will propagate that error. cmd_ctx was passed in to examine(), which is wrong - removed that. git-svn-id: svn://svn.berlios.de/openocd/trunk@887 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/target/feroceon.c')
-rw-r--r--src/target/feroceon.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/target/feroceon.c b/src/target/feroceon.c
index c87320ae..8178e556 100644
--- a/src/target/feroceon.c
+++ b/src/target/feroceon.c
@@ -54,7 +54,7 @@
#include <stdlib.h>
#include <string.h>
-int feroceon_examine(struct command_context_s *cmd_ctx, struct target_s *target);
+int feroceon_examine(struct target_s *target);
int feroceon_target_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct target_s *target);
int feroceon_bulk_write_memory(target_t *target, u32 address, u32 count, u8 *buffer);
int feroceon_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
@@ -694,13 +694,13 @@ int feroceon_target_command(struct command_context_s *cmd_ctx, char *cmd, char *
}
-int feroceon_examine(struct command_context_s *cmd_ctx, struct target_s *target)
+int feroceon_examine(struct target_s *target)
{
armv4_5_common_t *armv4_5;
arm7_9_common_t *arm7_9;
int retval;
- retval = arm9tdmi_examine(cmd_ctx, target);
+ retval = arm9tdmi_examine(target);
if (retval!=ERROR_OK)
return retval;