X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fmips_m4k.h;h=5eb202969e4373206cff3e845b74b228c9bf88ca;hp=ccc8e6e781180aa4b09d2d5067a60eee7fdb5768;hb=e7e9bfde47768b22be8b15c30c027dc8fb67c778;hpb=0cba0d4df3fe120f08945703506f8405760325c9

diff --git a/src/target/mips_m4k.h b/src/target/mips_m4k.h
index ccc8e6e781..5eb202969e 100644
--- a/src/target/mips_m4k.h
+++ b/src/target/mips_m4k.h
@@ -23,28 +23,39 @@
 #ifndef MIPS_M4K_H
 #define MIPS_M4K_H
 
-#include "register.h"
-#include "target.h"
+#include <helper/types.h>
+
+struct target;
 
 #define MIPSM4K_COMMON_MAGIC	0xB321B321
 
-typedef struct mips_m4k_common_s
+struct mips_m4k_common
 {
 	int common_magic;
-	mips32_common_t mips32_common;
-} mips_m4k_common_t;
-
-extern int mips_m4k_bulk_write_memory(target_t *target, u32 address, u32 count, u8 *buffer);
-
-extern void mips_m4k_enable_breakpoints(struct target_s *target);
-extern int mips_m4k_set_breakpoint(struct target_s *target, breakpoint_t *breakpoint);
-extern int mips_m4k_unset_breakpoint(struct target_s *target, breakpoint_t *breakpoint);
-extern int mips_m4k_add_breakpoint(struct target_s *target, breakpoint_t *breakpoint);
-extern int mips_m4k_remove_breakpoint(struct target_s *target, breakpoint_t *breakpoint);
-extern int mips_m4k_set_watchpoint(struct target_s *target, watchpoint_t *watchpoint);
-extern int mips_m4k_unset_watchpoint(struct target_s *target, watchpoint_t *watchpoint);
-extern int mips_m4k_add_watchpoint(struct target_s *target, watchpoint_t *watchpoint);
-extern int mips_m4k_remove_watchpoint(struct target_s *target, watchpoint_t *watchpoint);
-extern void mips_m4k_enable_watchpoints(struct target_s *target);
+	bool is_pic32mx;
+	struct mips32_common mips32;
+};
+
+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 *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*/