TARGET/MIPS32_PRACC: review scope of functions

[fw/openocd] / src / target / mips_m4k.h

diff --git a/src/target/mips_m4k.h b/src/target/mips_m4k.h
index 89c0a1626f608e90f71bf1c15ca194f898cf61e6..5eb202969e4373206cff3e845b74b228c9bf88ca 100644 (file)
--- a/src/target/mips_m4k.h
+++ b/src/target/mips_m4k.h
@@ -23,31 +23,39 @@
 #ifndef MIPS_M4K_H
 #define MIPS_M4K_H
 
-#include "types.h"
+#include <helper/types.h>
 
-struct target_s;
+struct target;
 
 #define MIPSM4K_COMMON_MAGIC   0xB321B321
 
-typedef struct mips_m4k_common_s
+struct mips_m4k_common
 {
        int common_magic;
-       struct mips32_common mips32_common;
-} mips_m4k_common_t;
+       bool is_pic32mx;
+       struct mips32_common mips32;
+};
 
-int mips_m4k_bulk_write_memory(struct target_s *target,
+static inline struct mips_m4k_common *
+target_to_m4k(struct target *target)
+{
+       return container_of(target->arch_info,
+                       struct mips_m4k_common, mips32);
+}
+
+int mips_m4k_bulk_write_memory(struct target *target,
                uint32_t address, uint32_t count, uint8_t *buffer);
 
-void mips_m4k_enable_breakpoints(struct target_s *target);
-int mips_m4k_set_breakpoint(struct target_s *target, breakpoint_t *bp);
-int mips_m4k_unset_breakpoint(struct target_s *target, breakpoint_t *bp);
-int mips_m4k_add_breakpoint(struct target_s *target, breakpoint_t *bp);
-int mips_m4k_remove_breakpoint(struct target_s *target, breakpoint_t *bp);
-
-void mips_m4k_enable_watchpoints(struct target_s *target);
-int mips_m4k_set_watchpoint(struct target_s *target, struct watchpoint *wp);
-int mips_m4k_unset_watchpoint(struct target_s *target, struct watchpoint *wp);
-int mips_m4k_add_watchpoint(struct target_s *target, struct watchpoint *wp);
-int mips_m4k_remove_watchpoint(struct target_s *target, struct watchpoint *wp);
+void mips_m4k_enable_breakpoints(struct target *target);
+int mips_m4k_set_breakpoint(struct target *target, struct breakpoint *bp);
+int mips_m4k_unset_breakpoint(struct target *target, struct breakpoint *bp);
+int mips_m4k_add_breakpoint(struct target *target, struct breakpoint *bp);
+int mips_m4k_remove_breakpoint(struct target *target, struct breakpoint *bp);
+
+void mips_m4k_enable_watchpoints(struct target *target);
+int mips_m4k_set_watchpoint(struct target *target, struct watchpoint *wp);
+int mips_m4k_unset_watchpoint(struct target *target, struct watchpoint *wp);
+int mips_m4k_add_watchpoint(struct target *target, struct watchpoint *wp);
+int mips_m4k_remove_watchpoint(struct target *target, struct watchpoint *wp);
 
 #endif /*MIPS_M4K_H*/