jtag: jtag_add_ir_scan() now takes a single field

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

diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h
index e5a2bb71385542b76f61e1bcd0b835b8a8927004..93bee0710d875dfa833ab8fbab0e8c8d3cc44262 100644 (file)
--- a/src/target/arm7_9_common.h
+++ b/src/target/arm7_9_common.h
@@ -29,7 +29,8 @@
 #ifndef ARM7_9_COMMON_H
 #define ARM7_9_COMMON_H
 
-#include "armv4_5.h"
+#include "arm.h"
+#include "arm_jtag.h"
 
 #define        ARM7_9_COMMON_MAGIC 0x0a790a79 /**< */
 
@@ -119,7 +120,7 @@ static inline bool is_arm7_9(struct arm7_9_common *arm7_9)
        return arm7_9->common_magic == ARM7_9_COMMON_MAGIC;
 }
 
-int arm7_9_register_commands(struct command_context *cmd_ctx);
+extern const struct command_registration arm7_9_command_handlers[];
 
 int arm7_9_poll(struct target *target);
 
@@ -138,7 +139,6 @@ int arm7_9_full_context(struct target *target);
 int arm7_9_restore_context(struct target *target);
 int arm7_9_resume(struct target *target, int current, uint32_t address, int handle_breakpoints, int debug_execution);
 int arm7_9_step(struct target *target, int current, uint32_t address, int handle_breakpoints);
-int arm7_9_read_core_reg(struct target *target, int num, enum armv4_5_mode mode);
 int arm7_9_read_memory(struct target *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
 int arm7_9_write_memory(struct target *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
 int arm7_9_bulk_write_memory(struct target *target, uint32_t address, uint32_t count, uint8_t *buffer);
@@ -157,5 +157,6 @@ int arm7_9_execute_sys_speed(struct target *target);
 
 int arm7_9_init_arch_info(struct target *target, struct arm7_9_common *arm7_9);
 int arm7_9_examine(struct target *target);
+int arm7_9_check_reset(struct target *target);
 
 #endif /* ARM7_9_COMMON_H */