auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix SEGFAULT regression in cortex after TRST fixes

Browse Source 
git-svn-id: svn://svn.berlios.de/openocd/trunk@583 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe
2008-04-16 07:34:22 +00:00
parent 5295bb3121
commit 3aa95240ec
3 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/target/cortex_swjdp.c
View File

@@ -941,6 +941,7 @@ int ahbap_debugport_init(swjdp_common_t *swjdp)
u32 idreg, romaddr, dummy;
u32 ctrlstat;
int cnt = 0;
int retval;
LOG_DEBUG(" ");
@@ -955,14 +956,16 @@ int ahbap_debugport_init(swjdp_common_t *swjdp)
swjdp_write_dpacc(swjdp, swjdp->dp_ctrl_stat, DP_CTRL_STAT);
swjdp_read_dpacc(swjdp, &ctrlstat, DP_CTRL_STAT);
jtag_execute_queue();
if ((retval=jtag_execute_queue())!=ERROR_OK)
return retval;
/* Check that we have debug power domains activated */
while (!(ctrlstat & CDBGPWRUPACK) && (cnt++ < 10))
{
LOG_DEBUG("swjdp: wait CDBGPWRUPACK");
swjdp_read_dpacc(swjdp, &ctrlstat, DP_CTRL_STAT);
jtag_execute_queue();
if ((retval=jtag_execute_queue())!=ERROR_OK)
return retval;
usleep(10000);
}
@@ -970,7 +973,8 @@ int ahbap_debugport_init(swjdp_common_t *swjdp)
{
LOG_DEBUG("swjdp: wait CSYSPWRUPACK");
swjdp_read_dpacc(swjdp, &ctrlstat, DP_CTRL_STAT);
jtag_execute_queue();
if ((retval=jtag_execute_queue())!=ERROR_OK)
return retval;
usleep(10000);
}