X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm966e.h;h=23711448a27bcb69e77069b0c70f81575cd03ffb;hb=b00b9f2d7d2805ce0d038b2149b636c0576ee9ec;hp=e8346f9d436ad939102d433f3bfb15385fa8f4f6;hpb=6a0af06bd9f66780d2c3e9f69c40f2b89ad90605;p=openocd.git

diff --git a/src/target/arm966e.h b/src/target/arm966e.h
index e8346f9d43..23711448a2 100644
--- a/src/target/arm966e.h
+++ b/src/target/arm966e.h
@@ -20,6 +20,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifndef ARM966E_H
 #define ARM966E_H
 
@@ -27,22 +28,23 @@
 
 #define	ARM966E_COMMON_MAGIC 0x20f920f9
 
-typedef struct arm966e_common_s
-{
-	arm9tdmi_common_t arm9tdmi_common;
+struct arm966e_common {
+	struct arm7_9_common arm7_9_common;
 	int common_magic;
 	uint32_t cp15_control_reg;
-} arm966e_common_t;
+};
 
-static inline struct arm966e_common_s *
-target_to_arm966(struct target_s *target)
+static inline struct arm966e_common *
+target_to_arm966(struct target *target)
 {
-	return container_of(target->arch_info, struct arm966e_common_s,
-			arm9tdmi_common.arm7_9_common.armv4_5_common);
+	return container_of(target->arch_info, struct arm966e_common,
+			arm7_9_common.arm);
 }
 
-extern int arm966e_init_arch_info(target_t *target, arm966e_common_t *arm966e, jtag_tap_t *tap);
-extern int arm966e_register_commands(struct command_context_s *cmd_ctx);
-extern int arm966e_write_cp15(target_t *target, int reg_addr, uint32_t value);
+int arm966e_init_arch_info(struct target *target,
+		struct arm966e_common *arm966e, struct jtag_tap *tap);
+int arm966e_write_cp15(struct target *target, int reg_addr, uint32_t value);
+
+extern const struct command_registration arm966e_command_handlers[];
 
 #endif /* ARM966E_H */