David Brownell <david-b@pacbell.net>

Cleanup some the downloaded ARM target algorithm code:

 - Provide more complete disassembly of the DCC bulk write code

 - Make code blocks "static const", in case GCC doesn't

 - Fix some tabbing/layout issues

 - Make some arm7_9_common.h flags be "bool" not "int"; and compact
   the layout a bit (group most bools together)

git-svn-id: svn://svn.berlios.de/openocd/trunk@2698 b42882b7-edfa-0310-969c-e2dbd0fdcd60

1 files changed, 12 insertions, 11 deletions

diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h
index 68197b46..b3c3c583 100644
--- a/src/target/arm7_9_common.h
+++ b/src/target/arm7_9_common.h
@@ -46,6 +46,8 @@ 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 */
 	int breakpoint_count; /**< Current number of set breakpoints */
@@ -54,23 +56,22 @@ typedef struct arm7_9_common_s
 	int wp0_used; /**< Specifies if and how watchpoint unit 0 is used */
 	int wp1_used; /**< Specifies if and how watchpoint unit 1 is used */
 	int wp1_used_default; /**< Specifies if and how watchpoint unit 1 is used by default */
-	int force_hw_bkpts;
 	int dbgreq_adjust_pc; /**< Amount of PC adjustment caused by a DBGREQ */
-	int use_dbgrq; /**< Specifies if DBGRQ should be used to halt the target */
-	int need_bypass_before_restart; /**< Specifies if there should be a bypass before a JTAG restart */
+	bool use_dbgrq; /**< Specifies if DBGRQ should be used to halt the target */
+	bool need_bypass_before_restart; /**< Specifies if there should be a bypass before a JTAG restart */
 
-	etm_context_t *etm_ctx;
+	bool has_single_step;
+	bool has_monitor_mode;
+	bool has_vector_catch; /**< Specifies if the target has a reset vector catch */
 
-	int has_single_step;
-	int has_monitor_mode;
-	int has_vector_catch; /**< Specifies if the target has a reset vector catch */
+	bool debug_entry_from_reset; /**< Specifies if debug entry was from a reset */
 
-	int debug_entry_from_reset; /**< Specifies if debug entry was from a reset */
+	bool fast_memory_access;
+	bool dcc_downloads;
 
-	struct working_area_s *dcc_working_area;
+	etm_context_t *etm_ctx;
 
-	int fast_memory_access;
-	int dcc_downloads;
+	struct working_area_s *dcc_working_area;
 
 	int (*examine_debug_reason)(target_t *target); /**< Function for determining why debug state was entered */