Ferdinand Postema [ferdinand@postema.eu]

[openocd] / src / target / mips_ejtag.h

diff --git a/src/target/mips_ejtag.h b/src/target/mips_ejtag.h
index cab8c11f8854072c5be40fc4d2d5d23c2f9d5845..274392a85587cf7c778c8293cefd4bca9838c7c5 100644 (file)
--- 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,25 +96,30 @@
 #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
 {
        jtag_tap_t *tap;
-       u32 impcode;
-       u32 idcode;
+       uint32_t impcode;
+       uint32_t idcode;
        /*int use_dma;*/
-       u32 ejtag_ctrl;
+       uint32_t ejtag_ctrl;
 } mips_ejtag_t;
 
-extern int mips_ejtag_set_instr(mips_ejtag_t *ejtag_info, int new_instr, in_handler_t handler);
+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, 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);
+extern int mips_ejtag_exit_debug(mips_ejtag_t *ejtag_info);
+extern int mips_ejtag_get_impcode(mips_ejtag_t *ejtag_info, uint32_t *impcode);
+extern int mips_ejtag_get_idcode(mips_ejtag_t *ejtag_info, uint32_t *idcode);
+extern int mips_ejtag_drscan_32(mips_ejtag_t *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);
+extern int mips_ejtag_read_debug(mips_ejtag_t *ejtag_info, uint32_t* debug_reg);
 
 #endif /* MIPS_EJTAG */