mem_ap_read_u32 error propagation

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

diff --git a/src/target/mips_m4k.h b/src/target/mips_m4k.h
index 4f5d3bff59e41e7663157fb0ecdc7cdcf3a60bb4..bb37ee2d4a063b54931cc50f13dda54d0941bc57 100644 (file)
--- a/src/target/mips_m4k.h
+++ b/src/target/mips_m4k.h
@@ -23,30 +23,24 @@
 #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;
-       
-       char *variant;
-} mips_m4k_common_t;
-
-extern int mips_m4k_bulk_write_memory(target_t *target, u32 address, u32 count, u8 *buffer);
+       bool is_pic32mx;
+       struct mips32_common mips32;
+};
 
-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);
+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*/