diff options
-rw-r--r-- | apps/netutils/telnetd/telnetd_daemon.c | 2 | ||||
-rw-r--r-- | nuttx/arch/arm/src/common/up_internal.h | 5 | ||||
-rw-r--r-- | nuttx/configs/stm3210e-eval/src/up_lcd.c | 1 | ||||
-rw-r--r-- | nuttx/configs/stm3220g-eval/src/up_lcd.c | 7 | ||||
-rw-r--r-- | nuttx/libc/stdio/lib_lowsyslog.c | 2 | ||||
-rw-r--r-- | nuttx/libc/stdio/lib_syslog.c | 2 |
6 files changed, 9 insertions, 10 deletions
diff --git a/apps/netutils/telnetd/telnetd_daemon.c b/apps/netutils/telnetd/telnetd_daemon.c index e08d23d04..4d2ab943b 100644 --- a/apps/netutils/telnetd/telnetd_daemon.c +++ b/apps/netutils/telnetd/telnetd_daemon.c @@ -51,7 +51,9 @@ #include <sched.h> #include <errno.h> #include <debug.h> + #include <netinet/in.h> +#include <arpa/inet.h> #include <apps/netutils/telnetd.h> #include <apps/netutils/netlib.h> diff --git a/nuttx/arch/arm/src/common/up_internal.h b/nuttx/arch/arm/src/common/up_internal.h index b02317128..bd60b0fad 100644 --- a/nuttx/arch/arm/src/common/up_internal.h +++ b/nuttx/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/nuttx/configs/stm3210e-eval/src/up_lcd.c b/nuttx/configs/stm3210e-eval/src/up_lcd.c index ffa32c415..a295b53fc 100644 --- a/nuttx/configs/stm3210e-eval/src/up_lcd.c +++ b/nuttx/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/nuttx/configs/stm3220g-eval/src/up_lcd.c b/nuttx/configs/stm3220g-eval/src/up_lcd.c index e77206893..3592e8a8f 100644 --- a/nuttx/configs/stm3220g-eval/src/up_lcd.c +++ b/nuttx/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/nuttx/libc/stdio/lib_lowsyslog.c b/nuttx/libc/stdio/lib_lowsyslog.c index e35db0fae..6b6919122 100644 --- a/nuttx/libc/stdio/lib_lowsyslog.c +++ b/nuttx/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/nuttx/libc/stdio/lib_syslog.c b/nuttx/libc/stdio/lib_syslog.c index 97465d51b..06c4637c3 100644 --- a/nuttx/libc/stdio/lib_syslog.c +++ b/nuttx/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); } |