X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftarget%2Farm9tdmi.h;h=aff9fc5f41aa0af9e91c89d95680f995674051fc;hb=c725167ba8e2aa9e43bc86e28b44b6cb444740a8;hp=8bf2713e89e16e40b89131471c817d24c40e36c0;hpb=178c7580960b4d84fe83ef579250fba1d6ac4f2d;p=fw%2Fopenocd

diff --git a/src/target/arm9tdmi.h b/src/target/arm9tdmi.h
index 8bf2713e8..aff9fc5f4 100644
--- a/src/target/arm9tdmi.h
+++ b/src/target/arm9tdmi.h
@@ -25,60 +25,33 @@
 
 #include "embeddedice.h"
 
-/* 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
-{
-	arm7_9_common_t arm7_9_common;
-} arm9tdmi_common_t;
-
-typedef struct arm9tdmi_vector_s
-{
-	char *name;
-	uint32_t value;
-} arm9tdmi_vector_t;
-
-enum arm9tdmi_vector
-{
-	ARM9TDMI_RESET_VECTOR = 0x01,
-	ARM9TDMI_UNDEF_VECTOR = 0x02,
-	ARM9TDMI_SWI_VECTOR = 0x04,
-	ARM9TDMI_PABT_VECTOR = 0x08,
-	ARM9TDMI_DABT_VECTOR = 0x10,
-	/* 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_examine(struct target_s *target);
-extern int arm9tdmi_init_arch_info(target_t *target,
-	arm9tdmi_common_t *arm9tdmi, jtag_tap_t *tap);
-extern int arm9tdmi_register_commands(struct command_context_s *cmd_ctx);
-
-extern int arm9tdmi_clock_out(arm_jtag_t *jtag_info,
-	uint32_t instr, uint32_t out, uint32_t *in, int sysspeed);
-extern int arm9tdmi_clock_data_in(arm_jtag_t *jtag_info, uint32_t *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,
-	uint32_t mask, uint32_t* core_regs[16]);
-extern void arm9tdmi_write_core_regs(target_t *target,
-	uint32_t mask, uint32_t core_regs[16]);
-
-extern int arm9tdmi_examine_debug_reason(target_t *target);
-
-extern void arm9tdmi_load_word_regs(target_t *target, uint32_t mask);
-extern void arm9tdmi_load_hword_reg(target_t *target, int num);
-extern void arm9tdmi_load_byte_reg(target_t *target, int num);
-extern void arm9tdmi_store_word_regs(target_t *target, uint32_t mask);
-extern void arm9tdmi_store_hword_reg(target_t *target, int num);
-extern void arm9tdmi_store_byte_reg(target_t *target, int num);
-
-extern void arm9tdmi_branch_resume(target_t *target);
-extern void arm9tdmi_enable_single_step(target_t *target, uint32_t next_pc);
-extern void arm9tdmi_disable_single_step(target_t *target);
+int arm9tdmi_init_target(struct command_context *cmd_ctx,
+		struct target *target);
+int arm9tdmi_init_arch_info(struct target *target,
+		struct arm7_9_common *arm7_9, struct jtag_tap *tap);
+extern const struct command_registration arm9tdmi_command_handlers[];
+
+int arm9tdmi_clock_out(struct arm_jtag *jtag_info,
+		uint32_t instr, uint32_t out, uint32_t *in, int sysspeed);
+int arm9tdmi_clock_data_in(struct arm_jtag *jtag_info, uint32_t *in);
+int arm9tdmi_clock_data_in_endianness(struct arm_jtag *jtag_info,
+		void *in, int size, int be);
+void arm9tdmi_read_core_regs(struct target *target,
+		uint32_t mask, uint32_t* core_regs[16]);
+void arm9tdmi_write_core_regs(struct target *target,
+		uint32_t mask, uint32_t core_regs[16]);
+
+int arm9tdmi_examine_debug_reason(struct target *target);
+
+void arm9tdmi_load_word_regs(struct target *target, uint32_t mask);
+void arm9tdmi_load_hword_reg(struct target *target, int num);
+void arm9tdmi_load_byte_reg(struct target *target, int num);
+void arm9tdmi_store_word_regs(struct target *target, uint32_t mask);
+void arm9tdmi_store_hword_reg(struct target *target, int num);
+void arm9tdmi_store_byte_reg(struct target *target, int num);
+
+void arm9tdmi_branch_resume(struct target *target);
+void arm9tdmi_enable_single_step(struct target *target, uint32_t next_pc);
+void arm9tdmi_disable_single_step(struct target *target);
 
 #endif /* ARM9TDMI_H */