aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Bonnes2013-01-16 16:54:30 +0100
committerUwe Bonnes2013-01-21 11:02:44 +0100
commit15d7077115f4c1fbaee03a0cb1b641e40215c86e (patch)
tree02f0c6eb4321ee296bc80f21cdf6b69f4ad48362
parent09715e1db84560e1669a4ee36d99ce4770cdd85d (diff)
traceswo: Move (now-constant) traceswo.c to platforms/stm32
-rw-r--r--src/include/traceswo.h (renamed from src/platforms/native/traceswo.h)1
-rw-r--r--src/platforms/stm32/cdcacm.c2
-rw-r--r--src/platforms/stm32/traceswo.c (renamed from src/platforms/native/traceswo.c)10
3 files changed, 5 insertions, 8 deletions
diff --git a/src/platforms/native/traceswo.h b/src/include/traceswo.h
index 9b2cf2c..5566f94 100644
--- a/src/platforms/native/traceswo.h
+++ b/src/include/traceswo.h
@@ -26,4 +26,3 @@ void traceswo_init(void);
void trace_buf_drain(usbd_device *dev, uint8_t ep);
#endif
-
diff --git a/src/platforms/stm32/cdcacm.c b/src/platforms/stm32/cdcacm.c
index 2bbdcb6..9799d13 100644
--- a/src/platforms/stm32/cdcacm.c
+++ b/src/platforms/stm32/cdcacm.c
@@ -37,7 +37,7 @@
#include "platform.h"
#if defined(PLATFORM_HAS_TRACESWO)
-#include "traceswo.h"
+#include <traceswo.h>
#endif
#include <usbuart.h>
diff --git a/src/platforms/native/traceswo.c b/src/platforms/stm32/traceswo.c
index 7cd42d1..31fdc4e 100644
--- a/src/platforms/native/traceswo.c
+++ b/src/platforms/stm32/traceswo.c
@@ -130,19 +130,19 @@ void trace_isr(void)
duty = TIM_CCR2(TRACE_TIM);
/* Reset decoder state if crazy shit happened */
- if ((bt && (((duty / bt) > 2) || ((duty / bt) == 0))) || (duty == 0))
+ if ((bt && (((duty / bt) > 2) || ((duty / bt) == 0))) || (duty == 0))
goto flush_and_reset;
if(!(sr & TIM_SR_CC1IF)) notstart = 1;
if (!bt) {
- if (notstart) {
+ if (notstart) {
notstart = 0;
return;
}
/* First bit, sync decoder */
duty -= ALLOWED_DUTY_ERROR;
- if (((cycle / duty) != 2) &&
+ if (((cycle / duty) != 2) &&
((cycle / duty) != 3))
return;
bt = duty;
@@ -176,7 +176,7 @@ void trace_isr(void)
decbuf_pos++;
}
- if (decbuf_pos < 128)
+ if (decbuf_pos < 128)
return;
flush_and_reset:
@@ -187,5 +187,3 @@ flush_and_reset:
decbuf_pos = 0;
memset(decbuf, 0, sizeof(decbuf));
}
-
-