armv7m_core_reg_t -> struct armv7m_core_reg

[openocd.git] / src / target / armv4_5_mmu.h

diff --git a/src/target/armv4_5_mmu.h b/src/target/armv4_5_mmu.h
index dc9f5956b2bb2f6d4c96a3699e60bf7a0c4fa094..4357c92ffd3f735b9afdab43efbff22e4a500f4b 100644 (file)
--- a/src/target/armv4_5_mmu.h
+++ b/src/target/armv4_5_mmu.h
@@ -23,17 +23,17 @@
 #include "armv4_5_cache.h"
 #include "target.h"
 
-typedef struct armv4_5_mmu_common_s
+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;
+       struct armv4_5_cache_common armv4_5_cache;
        int has_tiny_pages;
        int mmu_enabled;
-} armv4_5_mmu_common_t;
+};
 
 enum
 {
@@ -42,13 +42,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(target_t *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(target_t *target,
+               struct armv4_5_mmu_common *armv4_5_mmu,
+               uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
 
-extern int armv4_5_mmu_handle_virt2phys_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, target_t *target, armv4_5_mmu_common_t *armv4_5_mmu);
-extern int armv4_5_mmu_handle_md_phys_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, target_t *target, armv4_5_mmu_common_t *armv4_5_mmu);
-extern int armv4_5_mmu_handle_mw_phys_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, target_t *target, armv4_5_mmu_common_t *armv4_5_mmu);
+int armv4_5_mmu_write_physical(target_t *target,
+               struct armv4_5_mmu_common *armv4_5_mmu,
+               uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
 
 enum
 {