From c2af99d4717837761b6df750e1fe75797c910b23 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Wed, 2 Dec 2009 22:57:07 -0800 Subject: ARM DPM: tweak initialization Move the initial breakpoint/watchpoint disable calls to arm_dpm_initialize(), and start using that routine. This split helps with arm11 support. --- src/target/arm11_dbgtap.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src/target/arm11_dbgtap.c') diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c index cfcb5bfa..6ce308e5 100644 --- a/src/target/arm11_dbgtap.c +++ b/src/target/arm11_dbgtap.c @@ -1022,10 +1022,11 @@ static int arm11_dpm_instr_read_data_r0(struct arm_dpm *dpm, opcode, data); } - -void arm11_dpm_init(struct arm11_common *arm11, uint32_t didr) +/** Set up high-level debug module utilities */ +int arm11_dpm_init(struct arm11_common *arm11, uint32_t didr) { struct arm_dpm *dpm = &arm11->dpm; + int retval; dpm->arm = &arm11->arm; @@ -1039,4 +1040,12 @@ void arm11_dpm_init(struct arm11_common *arm11, uint32_t didr) dpm->instr_read_data_dcc = arm11_dpm_instr_read_data_dcc; dpm->instr_read_data_r0 = arm11_dpm_instr_read_data_r0; + + retval = arm_dpm_setup(dpm); + if (retval != ERROR_OK) + return retval; + + retval = arm_dpm_initialize(dpm); + + return retval; } -- cgit v1.2.3