X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm720t.h;h=31dad9c76cd7fdf6ce7fe6fb182f8608438602d1;hp=d16e3e6b5d73e6065d48991b9bd04be6807bead3;hb=651998e33771bdad56873e3e70bd875104ca1d12;hpb=4b97f3cbb9603c13f69f8d3b5371c12045593126

diff --git a/src/target/arm720t.h b/src/target/arm720t.h
index d16e3e6b5d..31dad9c76c 100644
--- a/src/target/arm720t.h
+++ b/src/target/arm720t.h
@@ -13,31 +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
 
-#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
 
-typedef struct arm720t_common_s
+struct arm720t_common {
+	struct arm7_9_common arm7_9_common;
+	uint32_t common_magic;
+	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_reg;
-	u32 far_reg;
-} arm720t_common_t;
+	return container_of(target->arch_info, struct arm720t_common, arm7_9_common.arm);
+}
 
-#endif /* ARM720T_H */
+#endif /* OPENOCD_TARGET_ARM720T_H */