X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm966e.h;h=e7ace9299ed59d961fe1542bdf2a57d8746edfb6;hb=d84c7d91960bbba0079268d165f0bb29a0da4d86;hp=b98c022489e7dc653cfd160149316bc2b3cf819f;hpb=68c598e88d5e09728ea845a81ab279c615bbaf0f;p=openocd.git

diff --git a/src/target/arm966e.h b/src/target/arm966e.h
index b98c022489..e7ace9299e 100644
--- a/src/target/arm966e.h
+++ b/src/target/arm966e.h
@@ -18,27 +18,33 @@
  *   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
 
-#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 int arm966e_read_cp15(target_t *target, int reg_addr, u32 *value);
-extern int arm966e_write_cp15(target_t *target, int reg_addr, u32 value);
+extern const struct command_registration arm966e_command_handlers[];
 
 #endif /* ARM966E_H */