imi415/openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target: Remove soft_reset_halt_imp

Browse Source 
Change-Id: I12c907584ef73de570eba2dcfeb8477cabc6098f
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/1217
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
This commit is contained in:
Andreas Fritiofson 2013-03-10 12:50:29 +01:00 committed by Spencer Oliver
parent dd9145b52e
commit 80b80ef9b4
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/target/target.c
View File

@ -677,18 +677,18 @@ static int target_read_memory_imp(struct target *target, uint32_t address,
return target->type->read_memory_imp(target, address, size, count, buffer); return target->type->read_memory_imp(target, address, size, count, buffer);
} }
static int target_soft_reset_halt_imp(struct target *target) static int target_soft_reset_halt(struct target *target)
{ {
if (!target_was_examined(target)) { if (!target_was_examined(target)) {
LOG_ERROR("Target not examined yet"); LOG_ERROR("Target not examined yet");
return ERROR_FAIL; return ERROR_FAIL;
} }
if (!target->type->soft_reset_halt_imp) { if (!target->type->soft_reset_halt) {
LOG_ERROR("Target %s does not support soft_reset_halt", LOG_ERROR("Target %s does not support soft_reset_halt",
target_name(target)); target_name(target));
return ERROR_FAIL; return ERROR_FAIL;
} }
return target->type->soft_reset_halt_imp(target); return target->type->soft_reset_halt(target);
} }
/** /**
@ -1099,9 +1099,6 @@ static int target_init_one(struct command_context *cmd_ctx,
type->read_memory_imp = target->type->read_memory; type->read_memory_imp = target->type->read_memory;
type->read_memory = target_read_memory_imp; type->read_memory = target_read_memory_imp;
type->soft_reset_halt_imp = target->type->soft_reset_halt;
type->soft_reset_halt = target_soft_reset_halt_imp;
/* Sanity-check MMU support ... stub in what we must, to help /* Sanity-check MMU support ... stub in what we must, to help
* implement it in stages, but warn if we need to do so. * implement it in stages, but warn if we need to do so.
*/ */
@ -2498,7 +2495,7 @@ COMMAND_HANDLER(handle_soft_reset_halt_command)
LOG_USER("requesting target halt and executing a soft reset"); LOG_USER("requesting target halt and executing a soft reset");
target->type->soft_reset_halt(target); target_soft_reset_halt(target);
return ERROR_OK; return ERROR_OK;
} }

1
src/target/target_type.h
View File

@ -88,7 +88,6 @@ struct target_type {
* reset run; halt * reset run; halt
*/ */
int (*deassert_reset)(struct target *target); int (*deassert_reset)(struct target *target);
int (*soft_reset_halt_imp)(struct target *target);
int (*soft_reset_halt)(struct target *target); int (*soft_reset_halt)(struct target *target);
/** /**