X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farmv4_5_mmu.h;h=6b9ed34c0ac5d4fc1ad224b45edbb0357fa94309;hb=e25819645ee2beb0818a79006eed9c9cedaaf5bb;hp=0c9b550110796f1a7fce43b644f7e733940cd3ff;hpb=1e5daf5886999a8ff01a4957e17c1466d76e022d;p=openocd.git

diff --git a/src/target/armv4_5_mmu.h b/src/target/armv4_5_mmu.h
index 0c9b550110..6b9ed34c0a 100644
--- a/src/target/armv4_5_mmu.h
+++ b/src/target/armv4_5_mmu.h
@@ -21,19 +21,20 @@
 #define ARMV4_5_MMU_H
 
 #include "armv4_5_cache.h"
-#include "target.h"
 
-typedef struct armv4_5_mmu_common_s
+struct target;
+
+struct armv4_5_mmu_common
 {
-	uint32_t (*get_ttb)(target_t *target);
-	int (*read_memory)(target_t *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
-	int (*write_memory)(target_t *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
-	void (*disable_mmu_caches)(target_t *target, int mmu, int d_u_cache, int i_cache);
-	void (*enable_mmu_caches)(target_t *target, int mmu, int d_u_cache, int i_cache);
-	armv4_5_cache_common_t armv4_5_cache;
+	uint32_t (*get_ttb)(struct target *target);
+	int (*read_memory)(struct target *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
+	int (*write_memory)(struct target *target, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
+	void (*disable_mmu_caches)(struct target *target, int mmu, int d_u_cache, int i_cache);
+	void (*enable_mmu_caches)(struct target *target, int mmu, int d_u_cache, int i_cache);
+	struct armv4_5_cache_common armv4_5_cache;
 	int has_tiny_pages;
 	int mmu_enabled;
-} armv4_5_mmu_common_t;
+};
 
 enum
 {
@@ -42,9 +43,17 @@ enum
 
 extern char* armv4_5_page_type_names[];
 
-extern uint32_t armv4_5_mmu_translate_va(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu, uint32_t va, int *type, uint32_t *cb, int *domain, uint32_t *ap);
-extern int armv4_5_mmu_read_physical(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
-extern int armv4_5_mmu_write_physical(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu, uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
+uint32_t armv4_5_mmu_translate_va(struct target *target,
+		struct armv4_5_mmu_common *armv4_5_mmu, uint32_t va, int *type,
+		uint32_t *cb, int *domain, uint32_t *ap);
+
+int armv4_5_mmu_read_physical(struct target *target,
+		struct armv4_5_mmu_common *armv4_5_mmu,
+		uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
+
+int armv4_5_mmu_write_physical(struct target *target,
+		struct armv4_5_mmu_common *armv4_5_mmu,
+		uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
 
 enum
 {