checkpatch: adapt shell script to the tool's new version

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

diff --git a/src/target/arm720t.h b/src/target/arm720t.h
index 2479b5485e47304951faab0e82c457fb4a1a5fab..65bd78ff080111534ffd716d728c7f40e8ef8baa 100644 (file)
--- a/src/target/arm720t.h
+++ b/src/target/arm720t.h
@@ -1,43 +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
 
-#include "target.h"
-#include "register.h"
-#include "embeddedice.h"
-#include "arm_jtag.h"
+#ifndef OPENOCD_TARGET_ARM720T_H
+#define OPENOCD_TARGET_ARM720T_H
+
 #include "arm7tdmi.h"
 #include "armv4_5_mmu.h"
-#include "armv4_5_cache.h"
 
-#define        ARM720T_COMMON_MAGIC 0xa720a720
+#define        ARM720T_COMMON_MAGIC 0xa720a720U
+
+struct arm720t_common {
+       unsigned int common_magic;
 
-typedef struct arm720t_common_s
+       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 *target)
 {
-       int common_magic;
-       armv4_5_mmu_common_t armv4_5_mmu;
-       arm7tdmi_common_t arm7tdmi_common;
-       u32 cp15_control_reg;
-       u32 fsr;
-       u32 far;
-} arm720t_common_t;
-
-#endif /* ARM720T_H */
+       return container_of(target->arch_info, struct arm720t_common, arm7_9_common.arm);
+}
+
+#endif /* OPENOCD_TARGET_ARM720T_H */