target_t -> struct target

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

diff --git a/src/target/arm9tdmi.h b/src/target/arm9tdmi.h
index fc650914a254543c1f0a20ce7e2b9ce4dee4491e..5165dc88bcd752e7c4979818fe2bcf84c02b56dc 100644 (file)
--- a/src/target/arm9tdmi.h
+++ b/src/target/arm9tdmi.h
@@ -23,49 +23,62 @@
 #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
-
-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;
-       u32 value;
-} arm9tdmi_vector_t;
+       uint32_t value;
+};
 
-enum arm9tdmi_vector
+enum arm9tdmi_vector_bit
 {
        ARM9TDMI_RESET_VECTOR = 0x01,
        ARM9TDMI_UNDEF_VECTOR = 0x02,
        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_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_target(struct command_context_s *cmd_ctx,
+               struct target *target);
+int arm9tdmi_examine(struct target *target);
+int arm9tdmi_init_arch_info(struct target *target,
+               struct arm9tdmi_common *arm9tdmi, struct jtag_tap *tap);
+int arm9tdmi_register_commands(struct command_context_s *cmd_ctx);
+
+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);
 
-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(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 */