Audit and eliminate redundant #include directives in other target files.

[fw/openocd] / src / target / mips_ejtag.h

diff --git a/src/target/mips_ejtag.h b/src/target/mips_ejtag.h
index b25bd0265299a4b0465fc0d36cf64d113376ca00..e9d076820abe857e99639b7bc7e27e807fbee964 100644 (file)
--- a/src/target/mips_ejtag.h
+++ b/src/target/mips_ejtag.h
@@ -23,9 +23,9 @@
 #ifndef MIPS_EJTAG
 #define MIPS_EJTAG
 
-#include "types.h"
 #include "jtag.h"
 
+/* tap instructions */
 #define EJTAG_INST_IDCODE              0x01
 #define EJTAG_INST_IMPCODE             0x03
 #define EJTAG_INST_ADDRESS             0x08
@@ -38,8 +38,9 @@
 #define EJTAG_INST_TCBCONTROLA 0x10
 #define EJTAG_INST_TCBCONTROLB 0x11
 #define EJTAG_INST_TCBDATA             0x12
-#define EJTAG_INST_BYPASS              0x1F
+#define EJTAG_INST_BYPASS              0xFF
 
+/* debug control register bits ECR */
 #define EJTAG_CTRL_TOF                 (1 << 1)
 #define EJTAG_CTRL_TIF                 (1 << 2)
 #define EJTAG_CTRL_BRKST               (1 << 3)
@@ -85,15 +86,27 @@
 #define EJTAG_DEBUG_DM                 (1 << 30)
 #define EJTAG_DEBUG_DBD                        (1 << 31)
 
+/* implementaion register bits */
+#define EJTAG_IMP_NODMA                        (1 << 14)
+#define EJTAG_IMP_MIPS16               (1 << 16)
+
+/* breakpoint support */
+#define EJTAG_DCR                              0xFF300000
+#define EJTAG_IBS                              0xFF301000
+#define EJTAG_IBA1                             0xFF301100
+#define EJTAG_DBS                              0xFF302000
+#define EJTAG_DBA1                             0xFF302100
+
 typedef struct mips_ejtag_s
 {
-       int chain_pos;
+       jtag_tap_t *tap;
        u32 impcode;
-//     int use_dma;
+       u32 idcode;
+       /*int use_dma;*/
        u32 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);