|
From: <zw...@ma...> - 2009-06-01 23:53:23
|
Author: zwelch
Date: 2009-06-01 23:53:19 +0200 (Mon, 01 Jun 2009)
New Revision: 1981
Modified:
trunk/src/target/mips_ejtag.c
trunk/src/target/mips_ejtag.h
trunk/src/target/mips_m4k.c
Log:
Scrub final vestiges of in_handler from mips target APIs.
Modified: trunk/src/target/mips_ejtag.c
===================================================================
--- trunk/src/target/mips_ejtag.c 2009-06-01 19:58:20 UTC (rev 1980)
+++ trunk/src/target/mips_ejtag.c 2009-06-01 21:53:19 UTC (rev 1981)
@@ -56,7 +56,7 @@
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 @@
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 @@
{
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 */
Modified: trunk/src/target/mips_ejtag.h
===================================================================
--- trunk/src/target/mips_ejtag.h 2009-06-01 19:58:20 UTC (rev 1980)
+++ trunk/src/target/mips_ejtag.h 2009-06-01 21:53:19 UTC (rev 1981)
@@ -109,8 +109,8 @@
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);
Modified: trunk/src/target/mips_m4k.c
===================================================================
--- trunk/src/target/mips_m4k.c 2009-06-01 19:58:20 UTC (rev 1980)
+++ trunk/src/target/mips_m4k.c 2009-06-01 21:53:19 UTC (rev 1981)
@@ -857,7 +857,7 @@
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)
|