X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Ftarget_type.h;h=67041b31625a68e2a605d3e90ef09fedf2e99eed;hb=1527272fb21beee7839335ea5587e879163d2ed1;hp=9a0709d859e33837d6dbb6cef508a547281596f7;hpb=66ee303456910f684244a20a0ac2e958d40b78cb;p=openocd.git

diff --git a/src/target/target_type.h b/src/target/target_type.h
index 9a0709d859..67041b3162 100644
--- a/src/target/target_type.h
+++ b/src/target/target_type.h
@@ -26,7 +26,7 @@
 #ifndef TARGET_TYPE_H
 #define TARGET_TYPE_H
 
-#include "types.h"
+#include <helper/types.h>
 
 struct target;
 
@@ -39,7 +39,7 @@ struct target_type
 {
 	/**
 	 * Name of this type of target.  Do @b not access this
-	 * field directly, use target_get_name() instead.
+	 * field directly, use target_type_name() instead.
 	 */
 	char *name;
 
@@ -124,18 +124,24 @@ struct target_type
 	 * Target must be halted while this is invoked as this
 	 * will actually set up breakpoints on target.
 	 *
-	 * The breakpoint hardware will be set up upon adding the first breakpoint.
+	 * The breakpoint hardware will be set up upon adding the
+	 * first breakpoint.
 	 *
 	 * Upon GDB connection all breakpoints/watchpoints are cleared.
 	 */
 	int (*add_breakpoint)(struct target *target, struct breakpoint *breakpoint);
 
-	/* remove breakpoint. hw will only be updated if the target is currently halted.
+	/* remove breakpoint. hw will only be updated if the target
+	 * is currently halted.
 	 * However, this method can be invoked on unresponsive targets.
 	 */
 	int (*remove_breakpoint)(struct target *target, struct breakpoint *breakpoint);
+
+	/* add watchpoint ... see add_breakpoint() comment above. */
 	int (*add_watchpoint)(struct target *target, struct watchpoint *watchpoint);
-	/* remove watchpoint. hw will only be updated if the target is currently halted.
+
+	/* remove watchpoint. hw will only be updated if the target
+	 * is currently halted.
 	 * However, this method can be invoked on unresponsive targets.
 	 */
 	int (*remove_watchpoint)(struct target *target, struct watchpoint *watchpoint);
@@ -207,11 +213,6 @@ struct target_type
 
 	int (*mmu)(struct target *target, int *enabled);
 
-	/* Read coprocessor - arm specific. Default implementation returns error. */
-	int (*mrc)(struct target *target, int cpnum, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t *value);
-
-	/* Write coprocessor. Default implementation returns error.  */
-	int (*mcr)(struct target *target, int cpnum, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t value);
 };
 
 #endif // TARGET_TYPE_H