X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm966e.h;h=e7ace9299ed59d961fe1542bdf2a57d8746edfb6;hp=710f2071661d47b5f67f54fe51a0e7dc9b1a69d7;hb=ed085f379e3fb53cce4d788d5b18cc5a7dcba026;hpb=db116b1ea3c77a3c5850fccbce9e0795faa21dda

diff --git a/src/target/arm966e.h b/src/target/arm966e.h
index 710f207166..e7ace9299e 100644
--- a/src/target/arm966e.h
+++ b/src/target/arm966e.h
@@ -18,8 +18,9 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
+
 #ifndef ARM966E_H
 #define ARM966E_H
 
@@ -27,22 +28,23 @@
 
 #define	ARM966E_COMMON_MAGIC 0x20f920f9
 
-typedef struct arm966e_common_s
-{
+struct arm966e_common {
+	struct arm7_9_common arm7_9_common;
 	int common_magic;
-	arm9tdmi_common_t arm9tdmi_common;
 	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 */