X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm9tdmi.h;h=775d475815d60fa769a4433faf862e384014bac8;hp=e52bf78cd8a1ba9fdb094836b049bf08613feb09;hb=42ef503d37b18d907da16d26e99167566d5aabd1;hpb=68c598e88d5e09728ea845a81ab279c615bbaf0f

diff --git a/src/target/arm9tdmi.h b/src/target/arm9tdmi.h
index e52bf78cd8..775d475815 100644
--- a/src/target/arm9tdmi.h
+++ b/src/target/arm9tdmi.h
@@ -23,27 +23,20 @@
 #ifndef ARM9TDMI_H
 #define ARM9TDMI_H
 
-#include "target.h"
-#include "register.h"
-#include "armv4_5.h"
 #include "embeddedice.h"
-#include "arm_jtag.h"
-#include "arm7_9_common.h"
-
-#define	ARM9TDMI_COMMON_MAGIC 0x00a900a9
 
+/* FIXME we don't really need a separate arm9tdmi struct any more...
+ * remove it, the arm7/arm9 common struct suffices.
+ */
 typedef struct arm9tdmi_common_s
 {
-	int common_magic;
-	char *variant;
-	void *arch_info;
 	arm7_9_common_t arm7_9_common;
 } arm9tdmi_common_t;
 
 typedef struct arm9tdmi_vector_s
 {
 	char *name;
-	u32 value;
+	uint32_t value;
 } arm9tdmi_vector_t;
 
 enum arm9tdmi_vector
@@ -53,20 +46,39 @@ enum arm9tdmi_vector
 	ARM9TDMI_SWI_VECTOR = 0x04,
 	ARM9TDMI_PABT_VECTOR = 0x08,
 	ARM9TDMI_DABT_VECTOR = 0x10,
-	ARM9TDMI_RESERVED_VECTOR = 0x20,
+	/* BIT(5) reserved -- must be zero */
 	ARM9TDMI_IRQ_VECTOR = 0x40,
 	ARM9TDMI_FIQ_VECTOR = 0x80,
 };
 
-extern int arm9tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
+int arm9tdmi_init_target(struct command_context_s *cmd_ctx,
+		struct target_s *target);
 int arm9tdmi_examine(struct target_s *target);
-extern int arm9tdmi_init_arch_info(target_t *target, arm9tdmi_common_t *arm9tdmi, int chain_pos, const char *variant);
-extern int arm9tdmi_register_commands(struct command_context_s *cmd_ctx);
+int arm9tdmi_init_arch_info(target_t *target,
+		arm9tdmi_common_t *arm9tdmi, struct jtag_tap *tap);
+int arm9tdmi_register_commands(struct command_context_s *cmd_ctx);
+
+int arm9tdmi_clock_out(arm_jtag_t *jtag_info,
+		uint32_t instr, uint32_t out, uint32_t *in, int sysspeed);
+int arm9tdmi_clock_data_in(arm_jtag_t *jtag_info, uint32_t *in);
+int arm9tdmi_clock_data_in_endianness(arm_jtag_t *jtag_info,
+		void *in, int size, int be);
+void arm9tdmi_read_core_regs(target_t *target,
+		uint32_t mask, uint32_t* core_regs[16]);
+void arm9tdmi_write_core_regs(target_t *target,
+		uint32_t mask, uint32_t core_regs[16]);
+
+int arm9tdmi_examine_debug_reason(target_t *target);
+
+void arm9tdmi_load_word_regs(target_t *target, uint32_t mask);
+void arm9tdmi_load_hword_reg(target_t *target, int num);
+void arm9tdmi_load_byte_reg(target_t *target, int num);
+void arm9tdmi_store_word_regs(target_t *target, uint32_t mask);
+void arm9tdmi_store_hword_reg(target_t *target, int num);
+void arm9tdmi_store_byte_reg(target_t *target, int num);
 
-extern int arm9tdmi_clock_out(arm_jtag_t *jtag_info, u32 instr, u32 out, u32 *in, int sysspeed);
-extern int arm9tdmi_clock_data_in(arm_jtag_t *jtag_info, u32 *in);
-extern int arm9tdmi_clock_data_in_endianness(arm_jtag_t *jtag_info, void *in, int size, int be); 
-extern void arm9tdmi_read_core_regs(target_t *target, u32 mask, u32* core_regs[16]);
-extern void arm9tdmi_write_core_regs(target_t *target, u32 mask, u32 core_regs[16]);
+void arm9tdmi_branch_resume(target_t *target);
+void arm9tdmi_enable_single_step(target_t *target, uint32_t next_pc);
+void arm9tdmi_disable_single_step(target_t *target);
 
 #endif /* ARM9TDMI_H */