X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm920t.h;h=3401b0945c3fdd0c26a90cd8bd3435df436d68e4;hp=567c8def67a4c794562cbbb3cdbed60096770dc7;hb=d4b7cbff88bb5eb14fececdbd8e2a0b3e58ce6e0;hpb=98723c4ecdbe06f90c66f3abec27b792c3b38e34

diff --git a/src/target/arm920t.h b/src/target/arm920t.h
index 567c8def67..3401b0945c 100644
--- a/src/target/arm920t.h
+++ b/src/target/arm920t.h
@@ -13,21 +13,19 @@
  *   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 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
 
-struct arm920t_common
-{
-	struct arm9tdmi_common arm9tdmi_common;
+struct arm920t_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;
@@ -38,21 +36,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;
@@ -63,14 +57,15 @@ 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);
 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);
+	uint32_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 *cmd_ctx);
 
-#endif /* ARM920T_H */
+extern const struct command_registration arm920t_command_handlers[];
+
+#endif /* OPENOCD_TARGET_ARM920T_H */