arm9tdmi_vector_t -> struct arm9tdmi_vector

[openocd.git] / src / target / arm9tdmi.h

diff --git a/src/target/arm9tdmi.h b/src/target/arm9tdmi.h
index 8f893163b60a8b9fed16c5955236a60ac1aa5e56..2e25b52c1212cd4ca1111916a25a5ceed535a26e 100644 (file)
--- a/src/target/arm9tdmi.h
+++ b/src/target/arm9tdmi.h
@@ -25,22 +25,21 @@
 
 #include "embeddedice.h"
 
-#define        ARM9TDMI_COMMON_MAGIC 0x00a900a9
-
-typedef struct arm9tdmi_common_s
+/* FIXME we don't really need a separate arm9tdmi struct any more...
+ * remove it, the arm7/arm9 common struct suffices.
+ */
+struct arm9tdmi_common
 {
-       int common_magic;
-       void *arch_info;
-       arm7_9_common_t arm7_9_common;
-} arm9tdmi_common_t;
+       struct arm7_9_common arm7_9_common;
+};
 
-typedef struct arm9tdmi_vector_s
+struct arm9tdmi_vector
 {
        char *name;
        uint32_t value;
-} arm9tdmi_vector_t;
+};
 
-enum arm9tdmi_vector
+enum arm9tdmi_vector_bit
 {
        ARM9TDMI_RESET_VECTOR = 0x01,
        ARM9TDMI_UNDEF_VECTOR = 0x02,
@@ -52,34 +51,34 @@ enum arm9tdmi_vector
        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, jtag_tap_t *tap);
-extern int arm9tdmi_register_commands(struct command_context_s *cmd_ctx);
+int arm9tdmi_init_arch_info(target_t *target,
+               struct arm9tdmi_common *arm9tdmi, struct jtag_tap *tap);
+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]);
+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(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]);
 
-extern int arm9tdmi_examine_debug_reason(target_t *target);
+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);
+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 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);
+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 */