X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftarget%2Farm920t.h;h=eba768ffff4cb922073520ce2c162cecd116e03b;hb=HEAD;hp=02f6da5c6de030354e6b7e79f657102b88c6fac8;hpb=0f1163e823c6ca3c2a81fa296157f5dde0635fea;p=fw%2Fopenocd

diff --git a/src/target/arm920t.h b/src/target/arm920t.h
index 02f6da5c6..eba768fff 100644
--- a/src/target/arm920t.h
+++ b/src/target/arm920t.h
@@ -1,34 +1,22 @@
+/* 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 ARM920T_H
-#define ARM920T_H
+
+#ifndef OPENOCD_TARGET_ARM920T_H
+#define OPENOCD_TARGET_ARM920T_H
 
 #include "arm9tdmi.h"
 #include "armv4_5_mmu.h"
 
-#define	ARM920T_COMMON_MAGIC 0xa920a920
+#define	ARM920T_COMMON_MAGIC 0xa920a920U
 
-struct arm920t_common
-{
-	struct arm9tdmi_common arm9tdmi_common;
-	uint32_t common_magic;
+struct arm920t_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 d_fsr;
@@ -38,21 +26,17 @@ struct arm920t_common
 	int preserve_cache;
 };
 
-static inline struct arm920t_common *
-target_to_arm920(struct target *target)
+static inline struct arm920t_common *target_to_arm920(struct target *target)
 {
-	return container_of(target->arch_info, struct arm920t_common,
-			arm9tdmi_common.arm7_9_common.armv4_5_common);
+	return container_of(target->arch_info, struct arm920t_common, arm7_9_common.arm);
 }
 
-struct arm920t_cache_line
-{
+struct arm920t_cache_line {
 	uint32_t cam;
 	uint32_t data[8];
 };
 
-struct arm920t_tlb_entry
-{
+struct arm920t_tlb_entry {
 	uint32_t cam;
 	uint32_t ram1;
 	uint32_t ram2;
@@ -61,16 +45,17 @@ struct arm920t_tlb_entry
 int arm920t_arch_state(struct target *target);
 int arm920t_soft_reset_halt(struct target *target);
 int arm920t_read_memory(struct target *target,
-	uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
+	target_addr_t address, uint32_t size, uint32_t count, uint8_t *buffer);
 int arm920t_write_memory(struct target *target,
-	uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
-void arm920t_post_debug_entry(struct target *target);
+	target_addr_t address, uint32_t size, uint32_t count, const uint8_t *buffer);
+int arm920t_post_debug_entry(struct target *target);
 void arm920t_pre_restore_context(struct target *target);
-	uint32_t arm920t_get_ttb(struct target *target);
-void arm920t_disable_mmu_caches(struct target *target,
+int arm920t_get_ttb(struct target *target, uint32_t *result);
+int arm920t_disable_mmu_caches(struct target *target,
 	int mmu, int d_u_cache, int i_cache);
-void arm920t_enable_mmu_caches(struct target *target,
+int arm920t_enable_mmu_caches(struct target *target,
 	int mmu, int d_u_cache, int i_cache);
-int arm920t_register_commands(struct command_context_s *cmd_ctx);
 
-#endif /* ARM920T_H */
+extern const struct command_registration arm920t_command_handlers[];
+
+#endif /* OPENOCD_TARGET_ARM920T_H */