X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm966e.h;h=23711448a27bcb69e77069b0c70f81575cd03ffb;hb=37a6e402502d698aaf9d4f6d32fe4ccdcc5ff9b6;hp=d4624f6c66e8750f87d75291fee64884a5b18416;hpb=4fc97d3f2726efa147cfdb0c456eace51550e1e3;p=openocd.git

diff --git a/src/target/arm966e.h b/src/target/arm966e.h
index d4624f6c66..23711448a2 100644
--- a/src/target/arm966e.h
+++ b/src/target/arm966e.h
@@ -2,6 +2,9 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2008 by Spencer Oliver                                  *
+ *   spen@spen-soft.co.uk                                                  *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -17,22 +20,31 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifndef ARM966E_H
 #define ARM966E_H
 
-#include "target.h"
-#include "register.h"
-#include "embeddedice.h"
-#include "arm_jtag.h"
 #include "arm9tdmi.h"
 
 #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;
-	u32 cp15_control_reg;
-} arm966e_common_t;
+	uint32_t cp15_control_reg;
+};
+
+static inline struct arm966e_common *
+target_to_arm966(struct target *target)
+{
+	return container_of(target->arch_info, struct arm966e_common,
+			arm7_9_common.arm);
+}
+
+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 */