change #include "jtag.h" to <jtag/jtag.h>

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

diff --git a/src/target/mips_ejtag.h b/src/target/mips_ejtag.h
index cd31d2334839cc3a45de7f735450065a92fe2d52..93b4a6aef48a52e7df2adaa6277e8b67cef44927 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"
+#include <jtag/jtag.h>
 
+/* tap instructions */
 #define EJTAG_INST_IDCODE              0x01
 #define EJTAG_INST_IMPCODE             0x03
 #define EJTAG_INST_ADDRESS             0x08
@@ -40,6 +40,7 @@
 #define EJTAG_INST_TCBDATA             0x12
 #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,23 +86,41 @@
 #define EJTAG_DEBUG_DM                 (1 << 30)
 #define EJTAG_DEBUG_DBD                        (1 << 31)
 
-typedef struct mips_ejtag_s
+/* 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
+#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)
+
+struct mips_ejtag
 {
-       int chain_pos;
-       u32 impcode;
-//     int use_dma;
-       u32 ejtag_ctrl;
-} mips_ejtag_t;
+       struct jtag_tap *tap;
+       uint32_t impcode;
+       uint32_t idcode;
+       /*int use_dma;*/
+       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 */