From 337017d626f9641fdafc50da5769e5bd14cfe30f Mon Sep 17 00:00:00 2001 From: zwelch Date: Mon, 1 Jun 2009 21:53:19 +0000 Subject: [PATCH] Scrub final vestiges of in_handler from mips target APIs. git-svn-id: svn://svn.berlios.de/openocd/trunk@1981 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/target/mips_ejtag.c | 6 +++--- src/target/mips_ejtag.h | 4 ++-- src/target/mips_m4k.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/target/mips_ejtag.c b/src/target/mips_ejtag.c index 02dc653b8..c4b133e09 100644 --- a/src/target/mips_ejtag.c +++ b/src/target/mips_ejtag.c @@ -56,7 +56,7 @@ int mips_ejtag_set_instr(mips_ejtag_t *ejtag_info, int new_instr, void *delete_m return ERROR_OK; } -int mips_ejtag_get_idcode(mips_ejtag_t *ejtag_info, u32 *idcode, in_handler_t handler) +int mips_ejtag_get_idcode(mips_ejtag_t *ejtag_info, u32 *idcode) { scan_field_t field; @@ -83,7 +83,7 @@ int mips_ejtag_get_idcode(mips_ejtag_t *ejtag_info, u32 *idcode, in_handler_t ha return ERROR_OK; } -int mips_ejtag_get_impcode(mips_ejtag_t *ejtag_info, u32 *impcode, in_handler_t handler) +int mips_ejtag_get_impcode(mips_ejtag_t *ejtag_info, u32 *impcode) { scan_field_t field; @@ -258,7 +258,7 @@ int mips_ejtag_init(mips_ejtag_t *ejtag_info) { u32 ejtag_version; - mips_ejtag_get_impcode(ejtag_info, &ejtag_info->impcode, NULL); + mips_ejtag_get_impcode(ejtag_info, &ejtag_info->impcode); LOG_DEBUG("impcode: 0x%8.8x", ejtag_info->impcode); /* get ejtag version */ diff --git a/src/target/mips_ejtag.h b/src/target/mips_ejtag.h index 5ac994ac2..d74d808bb 100644 --- a/src/target/mips_ejtag.h +++ b/src/target/mips_ejtag.h @@ -109,8 +109,8 @@ typedef struct mips_ejtag_s extern int mips_ejtag_set_instr(mips_ejtag_t *ejtag_info, int new_instr, void *delete_me_and_submit_patch); extern int mips_ejtag_enter_debug(mips_ejtag_t *ejtag_info); extern int mips_ejtag_exit_debug(mips_ejtag_t *ejtag_info); -extern int mips_ejtag_get_impcode(mips_ejtag_t *ejtag_info, u32 *impcode, in_handler_t handler); -extern int mips_ejtag_get_idcode(mips_ejtag_t *ejtag_info, u32 *idcode, in_handler_t handler); +extern int mips_ejtag_get_impcode(mips_ejtag_t *ejtag_info, u32 *impcode); +extern int mips_ejtag_get_idcode(mips_ejtag_t *ejtag_info, u32 *idcode); extern int mips_ejtag_drscan_32(mips_ejtag_t *ejtag_info, u32 *data); extern int mips_ejtag_init(mips_ejtag_t *ejtag_info); diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c index 7af40c12b..078e2956d 100644 --- a/src/target/mips_m4k.c +++ b/src/target/mips_m4k.c @@ -857,7 +857,7 @@ int mips_m4k_examine(struct target_s *target) if (!target_was_examined(target)) { - mips_ejtag_get_idcode(ejtag_info, &idcode, NULL); + mips_ejtag_get_idcode(ejtag_info, &idcode); ejtag_info->idcode = idcode; if (((idcode >> 1) & 0x7FF) == 0x29)