Revert "target: remove unused working area 'user' field"

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

diff --git a/src/target/arm926ejs.h b/src/target/arm926ejs.h
index 9202fc6f2bd12cb35cf1d1825e3f2ae0d8a59271..d3a1cb652a9f54de497edf462574daccb5be5a9b 100644 (file)
--- a/src/target/arm926ejs.h
+++ b/src/target/arm926ejs.h
@@ -17,40 +17,39 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifndef ARM926EJS_H
 #define ARM926EJS_H
 
-#include <target/arm9tdmi.h>
+#include "arm9tdmi.h"
 #include "armv4_5_mmu.h"
 
 #define        ARM926EJS_COMMON_MAGIC 0xa926a926
 
-struct arm926ejs_common
-{
+struct arm926ejs_common {
        struct arm7_9_common arm7_9_common;
        uint32_t common_magic;
        struct armv4_5_mmu_common armv4_5_mmu;
-       int (*read_cp15)(struct target *target, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t *value);
-       int (*write_cp15)(struct target *target, uint32_t op1, uint32_t op2, uint32_t CRn, uint32_t CRm, uint32_t value);
+       int (*read_cp15)(struct target *target, uint32_t op1, uint32_t op2,
+                       uint32_t CRn, uint32_t CRm, uint32_t *value);
+       int (*write_cp15)(struct target *target, uint32_t op1, uint32_t op2,
+                       uint32_t CRn, uint32_t CRm, uint32_t value);
        uint32_t cp15_control_reg;
        uint32_t d_fsr;
        uint32_t i_fsr;
        uint32_t d_far;
 };
 
-static inline struct arm926ejs_common *
-target_to_arm926(struct target *target)
+static inline struct arm926ejs_common *target_to_arm926(struct target *target)
 {
-       return container_of(target->arch_info, struct arm926ejs_common,
-                       arm7_9_common.armv4_5_common);
+       return container_of(target->arch_info, struct arm926ejs_common, arm7_9_common.arm);
 }
 
-
 int arm926ejs_init_arch_info(struct target *target,
                struct arm926ejs_common *arm926ejs, struct jtag_tap *tap);
 int arm926ejs_arch_state(struct target *target);
 int arm926ejs_write_memory(struct target *target,
-               uint32_t address, uint32_t size, uint32_t count, uint8_t *buffer);
+               uint32_t address, uint32_t size, uint32_t count, const uint8_t *buffer);
 int arm926ejs_soft_reset_halt(struct target *target);
 
 extern const struct command_registration arm926ejs_command_handlers[];