X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm7_9_common.h;h=a741c59003aad80d73be934236d597d36bf392f5;hb=a8a9eddca0f8f5d8ab73f22c5a159fe1748272d5;hp=d70bae265fad931c5edd61d023e81ff839203624;hpb=269040bbad7f18066f5ec5707447c33de6290ef5;p=openocd.git

diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h
index d70bae265f..a741c59003 100644
--- a/src/target/arm7_9_common.h
+++ b/src/target/arm7_9_common.h
@@ -29,8 +29,8 @@
 #ifndef ARM7_9_COMMON_H
 #define ARM7_9_COMMON_H
 
-#include "breakpoints.h"
-#include "armv4_5.h"
+#include "arm.h"
+#include "arm_jtag.h"
 
 #define	ARM7_9_COMMON_MAGIC 0x0a790a79 /**< */
 
@@ -103,9 +103,6 @@ struct arm7_9_common
 	void (*post_debug_entry)(struct target *target); /**< Callback function called after entering debug mode */
 
 	void (*pre_restore_context)(struct target *target); /**< Callback function called before restoring the processor context */
-	void (*post_restore_context)(struct target *target); /**< Callback function called after restoring the processor context */
-
-
 };
 
 static inline struct arm7_9_common *
@@ -120,13 +117,12 @@ 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);
 
 int arm7_9_target_request_data(struct target *target, uint32_t size, uint8_t *buffer);
 
-int arm7_9_setup(struct target *target);
 int arm7_9_assert_reset(struct target *target);
 int arm7_9_deassert_reset(struct target *target);
 int arm7_9_reset_request_halt(struct target *target);
@@ -135,11 +131,8 @@ int arm7_9_soft_reset_halt(struct target *target);
 int arm7_9_prepare_reset_halt(struct target *target);
 
 int arm7_9_halt(struct target *target);
-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);
@@ -158,5 +151,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 */