From bf565dc94b70d2b8cfdf356c1a97efd7f091d05c Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 23 Oct 2014 18:30:32 -0600 Subject: [PATCH] Fix compiler errors in up_itm_syslog.c. From Pierre-Noel Bouteville --- arch/arm/src/armv7-m/up_itm_syslog.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/arm/src/armv7-m/up_itm_syslog.c b/arch/arm/src/armv7-m/up_itm_syslog.c index 6bd1fffd631..749d03f1f6c 100644 --- a/arch/arm/src/armv7-m/up_itm_syslog.c +++ b/arch/arm/src/armv7-m/up_itm_syslog.c @@ -41,9 +41,14 @@ #include +#include + #include #include "nvic.h" +#include "itm.h" +#include "tpi.h" +#include "dwt.h" #include "up_arch.h" #include "itm_syslog.h" @@ -94,7 +99,7 @@ void itm_syslog_initialize(void) regval = getreg32(NVIC_DEMCR); regval |= NVIC_DEMCR_TRCENA; - putreg32(putreg, NVIC_DEMCR); + putreg32(regval, NVIC_DEMCR); putreg32(0xc5acce55,ITM_LAR); putreg32(0, ITM_TER); @@ -125,13 +130,13 @@ void itm_syslog_initialize(void) * ****************************************************************************/ -int syslog_putc(int ch); +int syslog_putc(int ch) { /* ITM enabled */ if ((getreg32(ITM_TCR) & ITM_TCR_ITMENA_Msk) == 0) { - return; + return EOF; } /* ITM Port "CONFIG_ARMV7M_ITMSYSLOG_PORT" enabled */