X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm946e.h;h=ee1ef3235f02c8662d005ff136ba13900e18584f;hb=e9493cc20a0c2160696b24757274ec4ee302ac39;hp=557674e3ac79789e48431218f6439642f148a095;hpb=9e3d43cfe75df7c4f6797d630576f1a02428b218;p=openocd.git

diff --git a/src/target/arm946e.h b/src/target/arm946e.h
index 557674e3ac..ee1ef3235f 100644
--- a/src/target/arm946e.h
+++ b/src/target/arm946e.h
@@ -19,35 +19,33 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   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.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
-#ifndef ARM946E_H
-#define ARM946E_H
+
+#ifndef OPENOCD_TARGET_ARM946E_H
+#define OPENOCD_TARGET_ARM946E_H
 
 #include "arm9tdmi.h"
 
-#define	ARM946E_COMMON_MAGIC 0x20f920f9
+#define ARM946E_COMMON_MAGIC 0x20f920f9
 
-struct arm946e_common
-{
+struct arm946e_common {
 	struct arm7_9_common arm7_9_common;
 	int common_magic;
 	uint32_t cp15_control_reg;
+	uint32_t cp15_cache_info;
 };
 
-static inline struct arm946e_common *
-target_to_arm946(struct target *target)
+static inline struct arm946e_common *target_to_arm946(struct target *target)
 {
 	return container_of(target->arch_info, struct arm946e_common,
-			arm7_9_common.armv4_5_common);
+			arm7_9_common.arm);
 }
 
 int arm946e_init_arch_info(struct target *target,
-		struct arm946e_common *arm946e, struct jtag_tap *tap);
+			   struct arm946e_common *arm946e, struct jtag_tap *tap);
 int arm946e_write_cp15(struct target *target, int reg_addr, uint32_t value);
 
 extern const struct command_registration arm946e_command_handlers[];
 
-#endif /* ARM946E_H */
+#endif /* OPENOCD_TARGET_ARM946E_H */