X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm926ejs.h;h=d3a1cb652a9f54de497edf462574daccb5be5a9b;hp=76cc24a0c30ddcc0f9528d7a6387d889d8967e38;hb=374127301ec1d72033b9d573b72c7abdfd61990d;hpb=2615bf4398f393ee1e387128064093dcd44749c8 diff --git a/src/target/arm926ejs.h b/src/target/arm926ejs.h index 76cc24a0c3..d3a1cb652a 100644 --- a/src/target/arm926ejs.h +++ b/src/target/arm926ejs.h @@ -17,6 +17,7 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + #ifndef ARM926EJS_H #define ARM926EJS_H @@ -25,27 +26,25 @@ #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);