summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Brownell <dbrownell@users.sourceforge.net>2009-12-19 13:24:59 -0800
committerDavid Brownell <dbrownell@users.sourceforge.net>2009-12-19 13:24:59 -0800
commit28f8e9dfb7bfaf87957c95790c3ffe5d9fbd8834 (patch)
tree4480b80b2f7b23d8c1fdab8de8b4a76731973485 /src
parentabe8b43755fdbc4fe92b966c48b367159deff226 (diff)
downloadopenocd+libswd-28f8e9dfb7bfaf87957c95790c3ffe5d9fbd8834.tar.gz
openocd+libswd-28f8e9dfb7bfaf87957c95790c3ffe5d9fbd8834.tar.bz2
openocd+libswd-28f8e9dfb7bfaf87957c95790c3ffe5d9fbd8834.tar.xz
openocd+libswd-28f8e9dfb7bfaf87957c95790c3ffe5d9fbd8834.zip
oocd_trace buildfixes
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'src')
-rw-r--r--src/target/oocd_trace.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/target/oocd_trace.c b/src/target/oocd_trace.c
index b9615bc5..2533c40d 100644
--- a/src/target/oocd_trace.c
+++ b/src/target/oocd_trace.c
@@ -238,21 +238,21 @@ static int oocd_trace_start_capture(struct etm_context *etm_ctx)
uint32_t control = 0x1; /* 0x1: enabled */
uint32_t trigger_count;
- if (((etm_ctx->portmode & ETM_PORT_MODE_MASK) != ETM_PORT_NORMAL)
- || ((etm_ctx->portmode & ETM_PORT_WIDTH_MASK) != ETM_PORT_4BIT))
+ if (((etm_ctx->control & ETM_PORT_MODE_MASK) != ETM_PORT_NORMAL)
+ || ((etm_ctx->control & ETM_PORT_WIDTH_MASK) != ETM_PORT_4BIT))
{
LOG_DEBUG("OpenOCD + trace only supports normal 4-bit ETM mode");
return ERROR_ETM_PORTMODE_NOT_SUPPORTED;
}
- if ((etm_ctx->portmode & ETM_PORT_CLOCK_MASK) == ETM_PORT_HALF_CLOCK)
+ if ((etm_ctx->control & ETM_PORT_CLOCK_MASK) == ETM_PORT_HALF_CLOCK)
{
control |= 0x2; /* half rate clock, capture at twice the clock rate */
}
/* OpenOCD + trace holds up to 16 million samples,
* but trigger counts is set in multiples of 16 */
- trigger_count = (1048576 * etm_ctx->trigger_percent) / 100;
+ trigger_count = (1048576 * /* trigger_percent */ 50) / 100;
/* capturing always starts at address zero */
oocd_trace_write_reg(oocd_trace, OOCD_TRACE_ADDRESS, 0x0);