X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fmips_m4k.h;h=bb37ee2d4a063b54931cc50f13dda54d0941bc57;hb=3428035a7e0890a319f40a5c7c61f5ebeb3126d0;hp=a7c5bb3927a511e2687b6ce3d26a255978c84e41;hpb=0f1163e823c6ca3c2a81fa296157f5dde0635fea;p=openocd.git

diff --git a/src/target/mips_m4k.h b/src/target/mips_m4k.h
index a7c5bb3927..bb37ee2d4a 100644
--- a/src/target/mips_m4k.h
+++ b/src/target/mips_m4k.h
@@ -23,7 +23,7 @@
 #ifndef MIPS_M4K_H
 #define MIPS_M4K_H
 
-#include "types.h"
+#include <helper/types.h>
 
 struct target;
 
@@ -32,22 +32,15 @@ struct target;
 struct mips_m4k_common
 {
 	int common_magic;
-	struct mips32_common mips32_common;
+	bool is_pic32mx;
+	struct mips32_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);
+static inline struct mips_m4k_common *
+target_to_m4k(struct target *target)
+{
+	return container_of(target->arch_info,
+			struct mips_m4k_common, mips32);
+}
 
 #endif	/*MIPS_M4K_H*/