X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm11_dbgtap.h;h=e45bdc2d91b273d71b965c048ff674aa1e652561;hb=4cc359794420dbe0aedba38bde0ee4d871cdb354;hp=33ab3ddbcafef09151eda7cf57f62c0531060064;hpb=55926f576f99a0c67b2836fedf0dc1bfc1260428;p=openocd.git

diff --git a/src/target/arm11_dbgtap.h b/src/target/arm11_dbgtap.h
index 33ab3ddbca..e45bdc2d91 100644
--- a/src/target/arm11_dbgtap.h
+++ b/src/target/arm11_dbgtap.h
@@ -11,17 +11,11 @@ void arm11_add_IR(struct arm11_common *arm11,
 		uint8_t instr, tap_state_t state);
 int arm11_add_debug_SCAN_N(struct arm11_common *arm11,
 		uint8_t chain, tap_state_t state);
-void arm11_add_debug_INST(struct arm11_common *arm11,
-		uint32_t inst, uint8_t *flag, tap_state_t state);
-int arm11_read_DSCR(struct arm11_common *arm11, uint32_t *dscr);
+int arm11_read_DSCR(struct arm11_common *arm11);
 int arm11_write_DSCR(struct arm11_common *arm11, uint32_t dscr);
 
-enum target_debug_reason arm11_get_DSCR_debug_reason(uint32_t dscr);
-
 int arm11_run_instr_data_prepare(struct arm11_common *arm11);
 int arm11_run_instr_data_finish(struct arm11_common *arm11);
-int arm11_run_instr_no_data(struct arm11_common *arm11,
-		uint32_t *opcode, size_t count);
 int arm11_run_instr_no_data1(struct arm11_common *arm11, uint32_t opcode);
 int arm11_run_instr_data_to_core(struct arm11_common *arm11,
 		uint32_t opcode, uint32_t *data, size_t count);
@@ -36,16 +30,14 @@ int arm11_run_instr_data_from_core_via_r0(struct arm11_common *arm11,
 int arm11_run_instr_data_to_core_via_r0(struct arm11_common *arm11,
 		uint32_t opcode, uint32_t data);
 
-int arm11_add_dr_scan_vc(int num_fields, struct scan_field *fields,
-		tap_state_t state);
-int arm11_add_ir_scan_vc(int num_fields, struct scan_field *fields,
+void arm11_add_dr_scan_vc(struct jtag_tap *tap, int num_fields, struct scan_field *fields,
 		tap_state_t state);
 
 /**
  * Used with arm11_sc7_run to make a list of read/write commands for
  * scan chain 7
  */
-typedef struct arm11_sc7_action_s
+struct arm11_sc7_action
 {
 	bool write; /**< Access mode: true for write, false for read. */
 	uint8_t	address; /**< Register address mode. Use enum #arm11_sc7 */
@@ -54,16 +46,19 @@ typedef struct arm11_sc7_action_s
 	 * this receives the read value when the function returns.
 	 */
 	uint32_t value;
-} arm11_sc7_action_t;
+};
 
 int arm11_sc7_run(struct arm11_common *arm11,
-		arm11_sc7_action_t *actions, size_t count);
+		struct arm11_sc7_action *actions, size_t count);
 
 /* Mid-level helper functions */
-void arm11_sc7_clear_vbw(struct arm11_common *arm11);
-void arm11_sc7_set_vcr(struct arm11_common *arm11, uint32_t value);
+int arm11_sc7_clear_vbw(struct arm11_common *arm11);
+int arm11_sc7_set_vcr(struct arm11_common *arm11, uint32_t value);
 
 int arm11_read_memory_word(struct arm11_common *arm11,
 		uint32_t address, uint32_t *result);
 
+int arm11_dpm_init(struct arm11_common *arm11, uint32_t didr);
+int arm11_bpwp_flush(struct arm11_common *arm11);
+
 #endif // ARM11_DBGTAP_H