X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm720t.h;h=65bd78ff080111534ffd716d728c7f40e8ef8baa;hp=ab9aef6ab506fd314a28f34ab1d1765081da7af6;hb=HEAD;hpb=f6dae0cf84de26846a18f3fcaea842ccd898a5c1

diff --git a/src/target/arm720t.h b/src/target/arm720t.h
index ab9aef6ab5..65bd78ff08 100644
--- a/src/target/arm720t.h
+++ b/src/target/arm720t.h
@@ -1,45 +1,31 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
 /***************************************************************************
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
- *                                                                         *
- *   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     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   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.             *
  ***************************************************************************/
-#ifndef ARM720T_H
-#define ARM720T_H
+
+#ifndef OPENOCD_TARGET_ARM720T_H
+#define OPENOCD_TARGET_ARM720T_H
 
 #include "arm7tdmi.h"
 #include "armv4_5_mmu.h"
 
-#define	ARM720T_COMMON_MAGIC 0xa720a720
+#define	ARM720T_COMMON_MAGIC 0xa720a720U
 
-struct arm720t_common
-{
-	struct arm7tdmi_common arm7tdmi_common;
-	uint32_t common_magic;
+struct arm720t_common {
+	unsigned int common_magic;
+
+	struct arm7_9_common arm7_9_common;
 	struct armv4_5_mmu_common armv4_5_mmu;
 	uint32_t cp15_control_reg;
 	uint32_t fsr_reg;
 	uint32_t far_reg;
 };
 
-static inline struct arm720t_common *
-target_to_arm720(struct target_s *target)
+static inline struct arm720t_common *target_to_arm720(struct target *target)
 {
-	return container_of(target->arch_info, struct arm720t_common,
-			arm7tdmi_common.arm7_9_common.armv4_5_common);
+	return container_of(target->arch_info, struct arm720t_common, arm7_9_common.arm);
 }
 
-#endif /* ARM720T_H */
+#endif /* OPENOCD_TARGET_ARM720T_H */