Revert "cortex_m3: add auto maskisr"

[openocd.git] / src / target / arm966e.h

diff --git a/src/target/arm966e.h b/src/target/arm966e.h
index e6155b5c34aaa385706052a1e825da6cb3acf52c..24dcec306401afe677c0368786df51f6e7e28429 100644 (file)
--- a/src/target/arm966e.h
+++ b/src/target/arm966e.h
@@ -29,21 +29,22 @@
 
 struct arm966e_common
 {
-       struct arm9tdmi_common arm9tdmi_common;
+       struct arm7_9_common arm7_9_common;
        int common_magic;
        uint32_t cp15_control_reg;
 };
 
 static inline struct arm966e_common *
-target_to_arm966(struct target_s *target)
+target_to_arm966(struct target *target)
 {
        return container_of(target->arch_info, struct arm966e_common,
-                       arm9tdmi_common.arm7_9_common.armv4_5_common);
+                       arm7_9_common.armv4_5_common);
 }
 
-int arm966e_init_arch_info(target_t *target,
+int arm966e_init_arch_info(struct target *target,
                struct arm966e_common *arm966e, struct jtag_tap *tap);
-int arm966e_register_commands(struct command_context_s *cmd_ctx);
-int arm966e_write_cp15(target_t *target, int reg_addr, uint32_t value);
+int arm966e_write_cp15(struct target *target, int reg_addr, uint32_t value);
+
+extern const struct command_registration arm966e_command_handlers[];
 
 #endif /* ARM966E_H */