sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed some issues with trace port capture. 

Process last capture even on timeout.  Prevents last bit getting lost.
On timeout, don't allow next edge to resync decoder.
Timeout on 6 bit periods instead of 5.
Set systick interrupt to low priority.
This commit is contained in:
Gareth McMullin 2012-04-29 20:32:10 +12:00
parent 86626085d8
commit 38bea69f8a
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/stm32/platform.c
View File

@ -78,6 +78,8 @@ int platform_init(void)
/* Setup heartbeat timer */ /* Setup heartbeat timer */
systick_set_clocksource(STK_CTRL_CLKSOURCE_AHB_DIV8); systick_set_clocksource(STK_CTRL_CLKSOURCE_AHB_DIV8);
systick_set_reload(900000); /* Interrupt us at 10 Hz */ systick_set_reload(900000); /* Interrupt us at 10 Hz */
SCB_SHPR(11) &= ~((15 << 4) & 0xff);
SCB_SHPR(11) |= ((14 << 4) & 0xff);
systick_interrupt_enable(); systick_interrupt_enable();
systick_counter_enable(); systick_counter_enable();

25
src/stm32/traceswo.c
View File

@ -109,35 +109,36 @@ void trace_buf_drain(uint8_t ep)
void tim3_isr(void) void tim3_isr(void)
{ {
uint16_t sr = TIM_SR(TIM3) & TIM_DIER(TIM3); uint16_t sr = TIM_SR(TIM3);
uint16_t duty, cycle; uint16_t duty, cycle;
static uint16_t bt; static uint16_t bt;
static uint8_t lastbit; static uint8_t lastbit;
static uint8_t decbuf[17]; static uint8_t decbuf[17];
static uint8_t decbuf_pos; static uint8_t decbuf_pos;
static uint8_t halfbit; static uint8_t halfbit;
static uint8_t notstart;
/* Reset decoder state if capture overflowed */ /* Reset decoder state if capture overflowed */
if (sr & (TIM_SR_CC1OF | TIM_SR_UIF)) { if (sr & (TIM_SR_CC1OF | TIM_SR_UIF)) {
timer_clear_flag(TIM3, TIM_SR_CC1OF | TIM_SR_UIF); timer_clear_flag(TIM3, TIM_SR_CC1OF | TIM_SR_UIF);
if (!(sr & TIM_SR_CC1IF)) { if (!(sr & (TIM_SR_CC2IF | TIM_SR_CC1IF)))
timer_set_period(TIM3, -1);
timer_disable_irq(TIM3, TIM_DIER_UIE);
goto flush_and_reset; goto flush_and_reset;
}
} }
if (!(sr & TIM_SR_CC1IF))
return;
cycle = TIM_CCR1(TIM3); cycle = TIM_CCR1(TIM3);
duty = TIM_CCR2(TIM3); duty = TIM_CCR2(TIM3);
/* Reset decoder state if crazy shit happened */ /* Reset decoder state if crazy shit happened */
if ((bt && ((duty / bt) > 2)) || (duty == 0)) if ((bt && (((duty / bt) > 2) || ((duty / bt) == 0))) || (duty == 0))
goto flush_and_reset; goto flush_and_reset;
if(!(sr & TIM_SR_CC1IF)) notstart = 1;
if (!bt) { if (!bt) {
if (notstart) {
notstart = 0;
return;
}
/* First bit, sync decoder */ /* First bit, sync decoder */
duty -= ALLOWED_DUTY_ERROR; duty -= ALLOWED_DUTY_ERROR;
if (((cycle / duty) != 2) && if (((cycle / duty) != 2) &&
@ -146,7 +147,7 @@ void tim3_isr(void)
bt = duty; bt = duty;
lastbit = 1; lastbit = 1;
halfbit = 0; halfbit = 0;
timer_set_period(TIM3, duty * 5); timer_set_period(TIM3, duty * 6);
timer_clear_flag(TIM3, TIM_SR_UIF); timer_clear_flag(TIM3, TIM_SR_UIF);
timer_enable_irq(TIM3, TIM_DIER_UIE); timer_enable_irq(TIM3, TIM_DIER_UIE);
} else { } else {
@ -161,7 +162,7 @@ void tim3_isr(void)
decbuf_pos++; decbuf_pos++;
} }
if (((cycle - duty) / bt) > 2) if (!(sr & TIM_SR_CC1IF) || (((cycle - duty) / bt) > 2))
goto flush_and_reset; goto flush_and_reset;
if (((cycle - duty) / bt) > 1) { if (((cycle - duty) / bt) > 1) {
@ -178,6 +179,8 @@ void tim3_isr(void)
return; return;
flush_and_reset: flush_and_reset:
timer_set_period(TIM3, -1);
timer_disable_irq(TIM3, TIM_DIER_UIE);
trace_buf_push(decbuf, decbuf_pos >> 3); trace_buf_push(decbuf, decbuf_pos >> 3);
bt = 0; bt = 0;
decbuf_pos = 0; decbuf_pos = 0;