X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm926ejs.h;h=604ab0803f6220dc64343f9f1c339913f86b1f1c;hb=6eee0729d79eab496d1d4368a2bae7e4e2d19876;hp=22081f4e63511660aecab08f82d2d4d27a737ad3;hpb=98723c4ecdbe06f90c66f3abec27b792c3b38e34;p=openocd.git

diff --git a/src/target/arm926ejs.h b/src/target/arm926ejs.h
index 22081f4e63..604ab0803f 100644
--- a/src/target/arm926ejs.h
+++ b/src/target/arm926ejs.h
@@ -20,14 +20,14 @@
 #ifndef ARM926EJS_H
 #define ARM926EJS_H
 
-#include "arm9tdmi.h"
-#include "armv4_5_mmu.h"
+#include <target/arm9tdmi.h>
+#include <target/armv4_5_mmu.h>
 
 #define	ARM926EJS_COMMON_MAGIC 0xa926a926
 
 struct arm926ejs_common
 {
-	struct arm9tdmi_common arm9tdmi_common;
+	struct arm7_9_common arm7_9_common;
 	uint32_t common_magic;
 	struct armv4_5_mmu_common armv4_5_mmu;
 	int (*read_cp15)(struct target *target, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t *value);
@@ -42,16 +42,17 @@ static inline struct arm926ejs_common *
 target_to_arm926(struct target *target)
 {
 	return container_of(target->arch_info, struct arm926ejs_common,
-		arm9tdmi_common.arm7_9_common.armv4_5_common);
+			arm7_9_common.armv4_5_common);
 }
 
 
 int arm926ejs_init_arch_info(struct target *target,
 		struct arm926ejs_common *arm926ejs, struct jtag_tap *tap);
-int arm926ejs_register_commands(struct command_context *cmd_ctx);
 int arm926ejs_arch_state(struct target *target);
 int arm926ejs_write_memory(struct target *target,
 		uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
 int arm926ejs_soft_reset_halt(struct target *target);
 
+extern const struct command_registration arm926ejs_command_handlers[];
+
 #endif /* ARM926EJS_H */