X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm926ejs.h;h=c652a3b092b3dd520ea9b9b42a4df3d1d1e617a1;hb=057e566097b41f9bfeee50e97ba6ef624189ae6a;hp=ec23f1406c96aeb5ec628473d04f7a3c23afe2f8;hpb=785115a6a0a850f24f01fb385757a331eea9f093;p=openocd.git

diff --git a/src/target/arm926ejs.h b/src/target/arm926ejs.h
index ec23f1406c..c652a3b092 100644
--- a/src/target/arm926ejs.h
+++ b/src/target/arm926ejs.h
@@ -1,57 +1,44 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
 /***************************************************************************
  *   Copyright (C) 2007 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 ARM926EJS_H
-#define ARM926EJS_H
+
+#ifndef OPENOCD_TARGET_ARM926EJS_H
+#define OPENOCD_TARGET_ARM926EJS_H
 
 #include "arm9tdmi.h"
 #include "armv4_5_mmu.h"
 
 #define	ARM926EJS_COMMON_MAGIC 0xa926a926
 
-struct arm926ejs_common
-{
-	struct arm9tdmi_common arm9tdmi_common;
+struct arm926ejs_common {
+	struct arm7_9_common arm7_9_common;
 	uint32_t common_magic;
-	armv4_5_mmu_common_t armv4_5_mmu;
-	int (*read_cp15)(target_t *target, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t *value);
-	int (*write_cp15)(target_t *target, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t value);
+	struct armv4_5_mmu_common armv4_5_mmu;
+	int (*read_cp15)(struct target *target, uint32_t op1, uint32_t op2,
+			uint32_t crn, uint32_t crm, uint32_t *value);
+	int (*write_cp15)(struct target *target, uint32_t op1, uint32_t op2,
+			uint32_t crn, uint32_t crm, uint32_t value);
 	uint32_t cp15_control_reg;
 	uint32_t d_fsr;
 	uint32_t i_fsr;
 	uint32_t d_far;
 };
 
-static inline struct arm926ejs_common *
-target_to_arm926(struct target_s *target)
+static inline struct arm926ejs_common *target_to_arm926(struct target *target)
 {
-	return container_of(target->arch_info, struct arm926ejs_common,
-		arm9tdmi_common.arm7_9_common.armv4_5_common);
+	return container_of(target->arch_info, struct arm926ejs_common, arm7_9_common.arm);
 }
 
-
-int arm926ejs_init_arch_info(target_t *target,
+int arm926ejs_init_arch_info(struct target *target,
 		struct arm926ejs_common *arm926ejs, struct jtag_tap *tap);
-int arm926ejs_register_commands(struct command_context_s *cmd_ctx);
-int arm926ejs_arch_state(struct target_s *target);
-int arm926ejs_write_memory(struct target_s *target,
-		uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
-int arm926ejs_soft_reset_halt(struct target_s *target);
+int arm926ejs_arch_state(struct target *target);
+int arm926ejs_write_memory(struct target *target,
+		target_addr_t address, uint32_t size, uint32_t count, const uint8_t *buffer);
+int arm926ejs_soft_reset_halt(struct target *target);
+
+extern const struct command_registration arm926ejs_command_handlers[];
 
-#endif /* ARM926EJS_H */
+#endif /* OPENOCD_TARGET_ARM926EJS_H */