X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fmips_ejtag.h;h=6a653d4f893ff7935f5c690af42612df08d3dc3f;hb=f86137066a6b42c46c457c9837a8015990bf71e6;hp=74ba20712fecc4435e20a067928044aac5bced85;hpb=a28eaa85f73759bb189a46308642502c9fa5aa4b;p=openocd.git

diff --git a/src/target/mips_ejtag.h b/src/target/mips_ejtag.h
index 74ba20712f..6a653d4f89 100644
--- a/src/target/mips_ejtag.h
+++ b/src/target/mips_ejtag.h
@@ -23,7 +23,6 @@
 #ifndef MIPS_EJTAG
 #define MIPS_EJTAG
 
-#include "types.h"
 #include "jtag.h"
 
 /* tap instructions */
@@ -97,24 +96,31 @@
 #define EJTAG_IBA1				0xFF301100
 #define EJTAG_DBS				0xFF302000
 #define EJTAG_DBA1				0xFF302100
+#define		EJTAG_DBCn_NOSB				(1 << 13)
+#define		EJTAG_DBCn_NOLB				(1 << 12)
+#define		EJTAG_DBCn_BLM_MASK			0xff
+#define		EJTAG_DBCn_BLM_SHIFT		4
+#define		EJTAG_DBCn_BE				(1 << 0)
 
-typedef struct mips_ejtag_s
+struct mips_ejtag
 {
-	jtag_tap_t *tap;
-	u32 impcode;
+	struct jtag_tap *tap;
+	uint32_t impcode;
+	uint32_t idcode;
 	/*int use_dma;*/
-	u32 ejtag_ctrl;
-} mips_ejtag_t;
+	uint32_t ejtag_ctrl;
+};
 
-extern int mips_ejtag_set_instr(mips_ejtag_t *ejtag_info, int new_instr, in_handler_t handler);
-extern int mips_ejtag_enter_debug(mips_ejtag_t *ejtag_info);
-extern int mips_ejtag_exit_debug(mips_ejtag_t *ejtag_info, int enable_interrupts);
-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_drscan_32(mips_ejtag_t *ejtag_info, u32 *data);
+int mips_ejtag_set_instr(struct mips_ejtag *ejtag_info,
+		int new_instr, void *delete_me_and_submit_patch);
+int mips_ejtag_enter_debug(struct mips_ejtag *ejtag_info);
+int mips_ejtag_exit_debug(struct mips_ejtag *ejtag_info);
+int mips_ejtag_get_impcode(struct mips_ejtag *ejtag_info, uint32_t *impcode);
+int mips_ejtag_get_idcode(struct mips_ejtag *ejtag_info, uint32_t *idcode);
+int mips_ejtag_drscan_32(struct mips_ejtag *ejtag_info, uint32_t *data);
 
-extern int mips_ejtag_init(mips_ejtag_t *ejtag_info);
-extern int mips_ejtag_config_step(mips_ejtag_t *ejtag_info, int enable_step);
-extern int mips_ejtag_read_debug(mips_ejtag_t *ejtag_info, u32* debug_reg);
+int mips_ejtag_init(struct mips_ejtag *ejtag_info);
+int mips_ejtag_config_step(struct mips_ejtag *ejtag_info, int enable_step);
+int mips_ejtag_read_debug(struct mips_ejtag *ejtag_info, uint32_t* debug_reg);
 
 #endif /* MIPS_EJTAG */