ARM11: per-core options should not be global

[openocd] / src / target / arm11.h

diff --git a/src/target/arm11.h b/src/target/arm11.h
index 421f8d185c699997cb64ca7b641aa31570c60a7b..9edadee1d911681f4f7b80c5305e0223b32c321f 100644 (file)
--- a/src/target/arm11.h
+++ b/src/target/arm11.h
@@ -23,8 +23,8 @@
 #ifndef ARM11_H
 #define ARM11_H
 
-#include <target/armv4_5.h>
-#include <target/arm_dpm.h>
+#include "arm.h"
+#include "arm_dpm.h"
 
 #define ARM11_TAP_DEFAULT                      TAP_INVALID
 
@@ -69,6 +69,18 @@ struct arm11_common
 
        bool    simulate_reset_on_next_halt;    /**< Perform cleanups of the ARM state on next halt */
 
+       /* Per-core configurable options.
+        * NOTE that several of these boolean options should not exist
+        * once the relevant code is known to work correctly.
+        */
+       bool memwrite_burst;
+       bool memwrite_error_fatal;
+       bool step_irq_enable;
+       bool hardware_step;
+
+       /** Configured Vector Catch Register settings. */
+       uint32_t vcr;
+
        struct arm_jtag jtag_info;
 };