From 100434b12ddddbf95fe10bc857d9b783c591a30f Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Mon, 16 Dec 2013 20:24:41 +0000 Subject: [PATCH] Update to latest libopencm3 And fix traceswo to match api change upstream. --- examples/stm32/f1/stm32-h103/traceswo/traceswo.c | 7 ++----- libopencm3 | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/examples/stm32/f1/stm32-h103/traceswo/traceswo.c b/examples/stm32/f1/stm32-h103/traceswo/traceswo.c index 41f28f7..00f74ba 100644 --- a/examples/stm32/f1/stm32-h103/traceswo/traceswo.c +++ b/examples/stm32/f1/stm32-h103/traceswo/traceswo.c @@ -42,9 +42,6 @@ static void trace_setup(void) TPIU_SPPR = TPIU_SPPR_ASYNC_MANCHESTER; TPIU_ACPR = 7; - /* Data width is 1 byte. */ - TPIU_CSPSR = TPIU_CSPSR_BYTE; - /* Formatter and flush control. */ TPIU_FFCR &= ~TPIU_FFCR_ENFCONT; @@ -70,10 +67,10 @@ static void gpio_setup(void) static void trace_send_blocking(char c) { - while (!(ITM_STIM[0] & ITM_STIM_FIFOREADY)) + while (!(ITM_STIM8(0) & ITM_STIM_FIFOREADY)) ; - ITM_STIM[0] = c; + ITM_STIM8(0) = c; } int main(void) diff --git a/libopencm3 b/libopencm3 index f4cd74a..fe6b542 160000 --- a/libopencm3 +++ b/libopencm3 @@ -1 +1 @@ -Subproject commit f4cd74a741084decb805d8dd15253f77f404ad24 +Subproject commit fe6b542357c7018b5a528bc7adba1079c3bb57eb