From 176491ce7529718f815c0659f731347683384393 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Wed, 8 Oct 2014 16:23:48 -0600
Subject: [PATCH] Misc changes to get a clean build after all of the syslog
changes. There are probably other things still broken
---
arch/arm/src/common/up_internal.h | 5 -----
configs/stm3210e-eval/src/up_lcd.c | 1 +
configs/stm3220g-eval/src/up_lcd.c | 7 ++++---
libc/stdio/lib_lowsyslog.c | 2 +-
libc/stdio/lib_syslog.c | 2 +-
5 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/arch/arm/src/common/up_internal.h b/arch/arm/src/common/up_internal.h
index b023171288..bd60b0fad1 100644
--- a/arch/arm/src/common/up_internal.h
+++ b/arch/arm/src/common/up_internal.h
@@ -210,13 +210,8 @@ extern const uint32_t g_idle_topstack;
/* Address of the saved user stack pointer */
#if CONFIG_ARCH_INTERRUPTSTACK > 3
-#if defined(CONFIG_ARCH_CORTEXM0) || defined(CONFIG_ARCH_CORTEXM3) || \
- defined(CONFIG_ARCH_CORTEXM4)
extern uint32_t g_intstackalloc; /* Allocated stack base */
extern uint32_t g_intstackbase; /* Initial top of interrupt stack */
-# else
-extern uint32_t g_intstackbase;
-# endif
#endif
/* These 'addresses' of these values are setup by the linker script. They are
diff --git a/configs/stm3210e-eval/src/up_lcd.c b/configs/stm3210e-eval/src/up_lcd.c
index ffa32c415f..a295b53fc7 100644
--- a/configs/stm3210e-eval/src/up_lcd.c
+++ b/configs/stm3210e-eval/src/up_lcd.c
@@ -712,6 +712,7 @@ static void stm3210e_dumprun(FAR const char *msg, FAR uint16_t *run, size_t npix
{
syslog(LOG_DEBUG, " %04x", *run++);
}
+
up_putc('\n');
}
}
diff --git a/configs/stm3220g-eval/src/up_lcd.c b/configs/stm3220g-eval/src/up_lcd.c
index e772068936..3592e8a8f8 100644
--- a/configs/stm3220g-eval/src/up_lcd.c
+++ b/configs/stm3220g-eval/src/up_lcd.c
@@ -549,15 +549,16 @@ static void stm3220g_dumprun(FAR const char *msg, FAR uint16_t *run, size_t npix
{
int i, j;
- syslog("\n%s:\n", msg);
+ syslog(LOG_DEBUG, "\n%s:\n", msg);
for (i = 0; i < npixels; i += 16)
{
up_putc(' ');
- syslog(" ");
+ syslog(LOG_DEBUG, " ");
for (j = 0; j < 16; j++)
{
- syslog(" %04x", *run++);
+ syslog(LOG_DEBUG, " %04x", *run++);
}
+
up_putc('\n');
}
}
diff --git a/libc/stdio/lib_lowsyslog.c b/libc/stdio/lib_lowsyslog.c
index e35db0fae1..6b69191224 100644
--- a/libc/stdio/lib_lowsyslog.c
+++ b/libc/stdio/lib_lowsyslog.c
@@ -119,7 +119,7 @@ int lowsyslog(int priority, FAR const char *fmt, ...)
#endif
{
va_start(ap, fmt);
- ret = lowvsyslog(fmt, ap);
+ ret = lowvsyslog(priority, fmt, ap);
va_end(ap);
}
diff --git a/libc/stdio/lib_syslog.c b/libc/stdio/lib_syslog.c
index 97465d51b9..06c4637c39 100644
--- a/libc/stdio/lib_syslog.c
+++ b/libc/stdio/lib_syslog.c
@@ -146,7 +146,7 @@ int syslog(int priority, FAR const char *fmt, ...)
#endif
{
va_start(ap, fmt);
- ret = vsyslog(fmt, ap);
+ ret = vsyslog(priority, fmt, ap);
va_end(ap);
}
--
GitLab