X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm720t.h;h=31dad9c76cd7fdf6ce7fe6fb182f8608438602d1;hb=ad6c71e151590f9d07eb07eda978a8d2a845259c;hp=25c682a0d385099d912d5419039ea78273a78690;hpb=bcb18b2044e9a9b812f8e0d390ed903f74524586;p=openocd.git

diff --git a/src/target/arm720t.h b/src/target/arm720t.h
index 25c682a0d3..31dad9c76c 100644
--- a/src/target/arm720t.h
+++ b/src/target/arm720t.h
@@ -13,33 +13,29 @@
  *   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 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
 
-struct arm720t_common
-{
-	arm7tdmi_common_t arm7tdmi_common;
+struct arm720t_common {
+	struct arm7_9_common arm7_9_common;
 	uint32_t common_magic;
-	armv4_5_mmu_common_t armv4_5_mmu;
+	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 */