mips: fix gaffe when removing dynamic array allocation

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

diff --git a/src/target/arm966e.h b/src/target/arm966e.h
index e8346f9d436ad939102d433f3bfb15385fa8f4f6..45aeb4ef1e6f1399e95773b08fd7218a68128573 100644 (file)
--- a/src/target/arm966e.h
+++ b/src/target/arm966e.h
@@ -27,22 +27,23 @@
 
 #define        ARM966E_COMMON_MAGIC 0x20f920f9
 
-typedef struct arm966e_common_s
+struct arm966e_common
 {
-       arm9tdmi_common_t arm9tdmi_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.armv4_5_common);
 }
 
-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_register_commands(struct command_context *cmd_ctx);
+int arm966e_write_cp15(struct target *target, int reg_addr, uint32_t value);
 
 #endif /* ARM966E_H */