X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm7_9_common.h;h=c0145d95e375f950a96b678d069e9c9da0a3c8ad;hb=ca594adb5a71f2bf60c1380172b8e61b075d9479;hp=d86ac24dc92a50d7dc9602d59f185bbc5b6ada42;hpb=db116b1ea3c77a3c5850fccbce9e0795faa21dda;p=openocd.git diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h index d86ac24dc9..c0145d95e3 100644 --- a/src/target/arm7_9_common.h +++ b/src/target/arm7_9_common.h @@ -39,6 +39,7 @@ */ typedef struct arm7_9_common_s { + armv4_5_common_t armv4_5_common; uint32_t common_magic; arm_jtag_t jtag_info; /**< JTAG information for target */ @@ -46,7 +47,6 @@ typedef struct arm7_9_common_s uint32_t arm_bkpt; /**< ARM breakpoint instruction */ uint16_t thumb_bkpt; /**< Thumb breakpoint instruction */ - bool force_hw_bkpts; int sw_breakpoints_added; /**< Specifies which watchpoint software breakpoints are setup on */ int sw_breakpoint_count; /**< keep track of number of software breakpoints we have set */ @@ -107,8 +107,6 @@ typedef struct arm7_9_common_s void (*pre_restore_context)(target_t *target); /**< Callback function called before restoring the processor context */ void (*post_restore_context)(target_t *target); /**< Callback function called after restoring the processor context */ - armv4_5_common_t armv4_5_common; - void *arch_info; } arm7_9_common_t;