refactor arm simulator to allow arm11 code to use it as well - no observable changes...

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

diff --git a/src/target/arm966e.h b/src/target/arm966e.h
index 7169820bae2d93e08ff266e459e317c096127672..64641eaea141d6be08ea1e79b116ce09a566cca1 100644 (file)
--- 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     *
@@ -20,10 +23,6 @@
 #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
@@ -32,10 +31,10 @@ typedef struct arm966e_common_s
 {
        int common_magic;
        arm9tdmi_common_t arm9tdmi_common;
-       u32 cp15_control_reg;
+       uint32_t cp15_control_reg;
 } arm966e_common_t;
 
-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 int arm966e_read_cp15(target_t *target, int reg_addr, uint32_t *value);
+extern int arm966e_write_cp15(target_t *target, int reg_addr, uint32_t value);
 
 #endif /* ARM966E_H */