Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-07 01:05:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'syslog'

Browse Source
This commit is contained in:
Gregory Nutt
2016-06-19 14:00:24 -06:00
parent 9f260ca193 5b2aa7bf99
commit 9e62164977
382 changed files with 1426 additions and 720 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/armv7-m/itm_syslog.h
+1 -1
View File
@@ -57,7 +57,7 @@
*
****************************************************************************/
#if defined(CONFIG_SYSLOG) || defined(CONFIG_ARMV7M_ITMSYSLOG)
#ifdef CONFIG_ARMV7M_ITMSYSLOG
void itm_syslog_initialize(void);
#else
# define itm_syslog_initialize()
arch/arm/src/armv7-m/up_itm_syslog.c
+74 -35
View File
@@ -2,7 +2,7 @@
* arch/arm/src/armv7-m/up_itm_syslog.c
*
* Copyright (C) 2014 Pierre-noel Bouteville . All rights reserved.
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved.
* Authors: Pierre-noel Bouteville <pnb990@gmail.com>
* Gregory Nutt <gnutt@nuttx.org>
*
@@ -52,7 +52,7 @@
#include "up_arch.h"
#include "itm_syslog.h"
#if defined(CONFIG_SYSLOG) || defined(CONFIG_ARMV7M_ITMSYSLOG)
#ifdef CONFIG_ARMV7M_ITMSYSLOG
/****************************************************************************
* Pre-processor Definitions
@@ -72,6 +72,73 @@
# define CONFIG_ARMV7M_ITMSYSLOG_PORT 0
#endif
/****************************************************************************
* Private Function Prototypes
****************************************************************************/
/* SYSLOG channel methods */
static int itm_putc(int ch);
static int itm_flush(void);
/****************************************************************************
* Private Data
****************************************************************************/
/* This structure describes the ITM SYSLOG channel */
static const struct syslog_channel_s g_itm_channel =
{
.sc_putc = itm_putc,
.sc_force = itm_putc,
.sc_flush = itm_flush,
};
/****************************************************************************
* Private Functions
****************************************************************************/
/****************************************************************************
* Name: itm_putc
*
* Description:
* This is the low-level system logging interface.
*
****************************************************************************/
static int itm_putc(int ch)
{
/* ITM enabled */
if ((getreg32(ITM_TCR) & ITM_TCR_ITMENA_Msk) == 0)
{
return EOF;
}
/* ITM Port "CONFIG_ARMV7M_ITMSYSLOG_PORT" enabled */
if (getreg32(ITM_TER) & (1 << CONFIG_ARMV7M_ITMSYSLOG_PORT))
{
while (getreg32(ITM_PORT(CONFIG_ARMV7M_ITMSYSLOG_PORT)) == 0);
putreg8((uint8_t)ch, ITM_PORT(CONFIG_ARMV7M_ITMSYSLOG_PORT));
}
return ch;
}
/****************************************************************************
* Name: itm_flush
*
* Description:
* A dummy FLUSH method
*
****************************************************************************/
static int itm_flush(void)
{
return OK;
}
/****************************************************************************
* Public Functions
****************************************************************************/
@@ -116,38 +183,10 @@ void itm_syslog_initialize(void)
putreg32(0x0001000d, ITM_TCR);
putreg32(0x00000100, TPI_FFCR);
putreg32(0xffffffff, ITM_TER); /* Enable 32 Ports */
/* Setup the SYSLOG channel */
(void)syslog_channel(&g_itm_channel);
}
/****************************************************************************
* Name: syslog_putc
*
* Description:
* This is the low-level system logging interface. The debugging/syslogging
* interfaces are syslog() and lowsyslog(). The difference is that
* the syslog() internface writes to fd=1 (stdout) whereas lowsyslog() uses
* a lower level interface that works from interrupt handlers. This
* function is the low-level interface used to implement lowsyslog().
*
****************************************************************************/
int syslog_putc(int ch)
{
/* ITM enabled */
if ((getreg32(ITM_TCR) & ITM_TCR_ITMENA_Msk) == 0)
{
return EOF;
}
/* ITM Port "CONFIG_ARMV7M_ITMSYSLOG_PORT" enabled */
if (getreg32(ITM_TER) & (1 << CONFIG_ARMV7M_ITMSYSLOG_PORT))
{
while (getreg32(ITM_PORT(CONFIG_ARMV7M_ITMSYSLOG_PORT)) == 0);
putreg8((uint8_t)ch, ITM_PORT(CONFIG_ARMV7M_ITMSYSLOG_PORT));
}
return ch;
}
#endif /* CONFIG_SYSLOG && CONFIG_ARMV7M_ITMSYSLOG */
#endif /* CONFIG_ARMV7M_ITMSYSLOG */
arch/arm/src/common/up_internal.h
-7
View File
@@ -101,13 +101,6 @@
# define USE_SERIALDRIVER 1
#endif
/* Determine which device to use as the system logging device */
#ifndef CONFIG_SYSLOG
# undef CONFIG_SYSLOG_CHAR
# undef CONFIG_RAMLOG_SYSLOG
#endif
/* Check if an interrupt stack size is configured */
#ifndef CONFIG_ARCH_INTERRUPTSTACK
arch/arm/src/efm32/efm32_clockconfig.c
+1 -1
View File
@@ -884,7 +884,7 @@ static inline void efm32_gpioclock(void)
*
****************************************************************************/
#if defined(CONFIG_SYSLOG) || defined(CONFIG_ARMV7M_ITMSYSLOG)
#ifdef CONFIG_ARMV7M_ITMSYSLOG
static inline void efm32_itm_syslog(void)
{
int regval;
arch/arm/src/stm32/stm32f40xxx_rcc.c
+1 -1
View File
@@ -911,7 +911,7 @@ static void stm32_stdclockconfig(void)
*
****************************************************************************/
#if defined(CONFIG_SYSLOG) && defined(CONFIG_ARMV7M_ITMSYSLOG)
#ifdef CONFIG_ARMV7M_ITMSYSLOG
static inline void rcc_itm_syslog(void)
{
/* Enable SWO output */
arch/avr/src/at32uc3/at32uc3_config.h
-7
View File
@@ -181,13 +181,6 @@
# define USE_SERIALDRIVER 1
#endif
/* Determine which device to use as the system logging device */
#ifndef CONFIG_SYSLOG
# undef CONFIG_SYSLOG_CHAR
# undef CONFIG_RAMLOG_SYSLOG
#endif
/* If GPIO IRQ support is defined, then a set of GPIOs must all be included */
#if CONFIG_AVR32_GPIOIRQSETA == 0 && CONFIG_AVR32_GPIOIRQSETB == 0
arch/avr/src/at90usb/at90usb_config.h
-7
View File
@@ -100,13 +100,6 @@
# define USE_SERIALDRIVER 1
#endif
/* Determine which device to use as the system logging device */
#ifndef CONFIG_SYSLOG
# undef CONFIG_SYSLOG_CHAR
# undef CONFIG_RAMLOG_SYSLOG
#endif
/************************************************************************************
* Public Types
************************************************************************************/
arch/avr/src/atmega/atmega_config.h
-7
View File
@@ -106,13 +106,6 @@
# define USE_SERIALDRIVER 1
#endif
/* Determine which device to use as the system logging device */
#ifndef CONFIG_SYSLOG
# undef CONFIG_SYSLOG_CHAR
# undef CONFIG_RAMLOG_SYSLOG
#endif
/************************************************************************************
* Public Types
************************************************************************************/
arch/avr/src/common/up_initialize.c
-7
View File
@@ -99,13 +99,6 @@
# define USE_SERIALDRIVER 1
#endif
/* Determine which device to use as the system logging device */
#ifndef CONFIG_SYSLOG
# undef CONFIG_SYSLOG_CHAR
# undef CONFIG_RAMLOG_SYSLOG
#endif
/****************************************************************************
* Private Functions
****************************************************************************/
arch/hc/src/common/up_internal.h
-7
View File
@@ -100,13 +100,6 @@
# define USE_SERIALDRIVER 1
#endif
/* Determine which device to use as the system logging device */
#ifndef CONFIG_SYSLOG
# undef CONFIG_SYSLOG_CHAR
# undef CONFIG_RAMLOG_SYSLOG
#endif
/* Check if an interrupt stack size is configured */
#ifndef CONFIG_ARCH_INTERRUPTSTACK
arch/mips/src/common/up_internal.h
-7
View File
@@ -98,13 +98,6 @@
# define USE_SERIALDRIVER 1
#endif
/* Determine which device to use as the system logging device */
#ifndef CONFIG_SYSLOG
# undef CONFIG_SYSLOG_CHAR
# undef CONFIG_RAMLOG_SYSLOG
#endif
/* Check if an interrupt stack size is configured */
#ifndef CONFIG_ARCH_INTERRUPTSTACK
arch/sh/src/common/up_internal.h
-7
View File
@@ -101,13 +101,6 @@
# define USE_SERIALDRIVER 1
#endif
/* Determine which device to use as the system logging device */
#ifndef CONFIG_SYSLOG
# undef CONFIG_SYSLOG_CHAR
# undef CONFIG_RAMLOG_SYSLOG
#endif
/* Check if an interrupt stack size is configured */
#ifndef CONFIG_ARCH_INTERRUPTSTACK
arch/sim/src/up_internal.h
-7
View File
@@ -96,13 +96,6 @@
# endif
#endif
/* Determine which device to use as the system logging device */
#ifndef CONFIG_SYSLOG
# undef CONFIG_SYSLOG_CHAR
# undef CONFIG_RAMLOG_SYSLOG
#endif
/* The design for how we signal UART data availability is up in the air */
#undef CONFIG_SIM_UART_DATAPOST
arch/x86/src/common/up_internal.h
-7
View File
@@ -100,13 +100,6 @@
# define USE_SERIALDRIVER 1
#endif
/* Determine which device to use as the system logging device */
#ifndef CONFIG_SYSLOG
# undef CONFIG_SYSLOG_CHAR
# undef CONFIG_RAMLOG_SYSLOG
#endif
/* Check if an interrupt stack size is configured */
#ifndef CONFIG_ARCH_INTERRUPTSTACK
arch/z16/src/common/up_internal.h
-7
View File
@@ -102,13 +102,6 @@
# define USE_SERIALDRIVER 1
#endif
/* Determine which device to use as the system logging device */
#ifndef CONFIG_SYSLOG
# undef CONFIG_SYSLOG_CHAR
# undef CONFIG_RAMLOG_SYSLOG
#endif
/* Macros for portability */
#define IN_INTERRUPT (g_current_regs != NULL)
configs/amber/hello/defconfig
-1
View File
@@ -298,7 +298,6 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y
# System Logging
#
# CONFIG_SYSLOG is not set
#
# Graphics Support
configs/arduino-due/nsh/defconfig
-1
View File
@@ -588,7 +588,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
#
# System Logging
#
# CONFIG_SYSLOG is not set
# CONFIG_SYSLOG_TIMESTAMP is not set
#
configs/arduino-mega2560/hello/defconfig
-1
View File
@@ -393,7 +393,6 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y
#
# System Logging
#
# CONFIG_SYSLOG is not set
# CONFIG_SYSLOG_TIMESTAMP is not set
#
configs/arduino-mega2560/nsh/defconfig
-1
View File
@@ -402,7 +402,6 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y
#
# System Logging
#
# CONFIG_SYSLOG is not set
# CONFIG_SYSLOG_TIMESTAMP is not set
#
configs/avr32dev1/nsh/defconfig
-1
View File
@@ -345,7 +345,6 @@ CONFIG_FS_FAT=y
# System Logging
#
# CONFIG_SYSLOG is not set
#
# Graphics Support
configs/avr32dev1/ostest/defconfig
-1
View File
@@ -335,7 +335,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
# System Logging
#
# CONFIG_SYSLOG is not set
#
# Graphics Support
configs/c5471evm/httpd/defconfig
-1
View File
@@ -514,7 +514,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
#
# System Logging
#
# CONFIG_SYSLOG is not set
# CONFIG_SYSLOG_TIMESTAMP is not set
#
configs/c5471evm/nettest/defconfig
-1
View File
@@ -539,7 +539,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
#
# System Logging
#
# CONFIG_SYSLOG is not set
# CONFIG_SYSLOG_TIMESTAMP is not set
#
configs/c5471evm/nsh/defconfig
-1
View File
@@ -581,7 +581,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
#
# System Logging
#
# CONFIG_SYSLOG is not set
# CONFIG_SYSLOG_TIMESTAMP is not set
#
configs/cc3200-launchpad/nsh/defconfig
-1
View File
@@ -453,7 +453,6 @@ CONFIG_FS_PROCFS=y
# System Logging
#
# CONFIG_SYSLOG is not set
#
# Graphics Support
configs/cloudctrl/nsh/defconfig
-1
View File
@@ -1029,7 +1029,6 @@ CONFIG_FAT_MAXFNAME=32
#
# System Logging
#
# CONFIG_SYSLOG is not set
# CONFIG_SYSLOG_TIMESTAMP is not set
#
configs/compal_e86/nsh_highram/defconfig
-1
View File
@@ -452,7 +452,6 @@ CONFIG_OTHER_SERIAL_CONSOLE=y
#
# System Logging
#
# CONFIG_SYSLOG is not set
# CONFIG_SYSLOG_TIMESTAMP is not set
#
configs/compal_e88/nsh_highram/defconfig
-1
View File
@@ -452,7 +452,6 @@ CONFIG_OTHER_SERIAL_CONSOLE=y
#
# System Logging
#
# CONFIG_SYSLOG is not set
# CONFIG_SYSLOG_TIMESTAMP is not set
#
configs/compal_e99/nsh_compalram/defconfig
-1
View File
@@ -489,7 +489,6 @@ CONFIG_OTHER_SERIAL_CONSOLE=y
#
# System Logging
#
# CONFIG_SYSLOG is not set
# CONFIG_SYSLOG_TIMESTAMP is not set
#
configs/compal_e99/nsh_highram/defconfig
-1
View File
@@ -488,7 +488,6 @@ CONFIG_OTHER_SERIAL_CONSOLE=y
#
# System Logging
#
# CONFIG_SYSLOG is not set
# CONFIG_SYSLOG_TIMESTAMP is not set
#
configs/demo9s12ne64/ostest/defconfig
-1
View File
@@ -292,7 +292,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
# System Logging
#
# CONFIG_SYSLOG is not set
#
# Graphics Support
configs/dk-tm4c129x/ipv6/defconfig
-1
View File
@@ -788,7 +788,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
#
# System Logging
#
# CONFIG_SYSLOG is not set
# CONFIG_SYSLOG_TIMESTAMP is not set
#
configs/dk-tm4c129x/nsh/defconfig
-1
View File
@@ -792,7 +792,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
#
# System Logging
#
# CONFIG_SYSLOG is not set
# CONFIG_SYSLOG_TIMESTAMP is not set
#
configs/ea3131/nsh/defconfig
-1
View File
@@ -453,7 +453,6 @@ CONFIG_FS_FAT=y
# System Logging
#
# CONFIG_SYSLOG is not set
#
# Graphics Support
configs/ea3131/pgnsh/defconfig
-1
View File
@@ -552,7 +552,6 @@ CONFIG_FS_FAT=y
#
# System Logging
#
# CONFIG_SYSLOG is not set
# CONFIG_SYSLOG_TIMESTAMP is not set
#
configs/ea3131/usbserial/defconfig
-1
View File
@@ -567,7 +567,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
#
# System Logging
#
# CONFIG_SYSLOG is not set
# CONFIG_SYSLOG_TIMESTAMP is not set
#
configs/ea3152/ostest/defconfig
-1
View File
@@ -442,7 +442,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
# System Logging
#
# CONFIG_SYSLOG is not set
#
# Graphics Support
configs/eagle100/httpd/defconfig
-1
View File
@@ -458,7 +458,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
# System Logging
#
# CONFIG_SYSLOG is not set
#
# Graphics Support
configs/eagle100/nettest/defconfig
-1
View File
@@ -668,7 +668,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
#
# System Logging
#
# CONFIG_SYSLOG is not set
# CONFIG_SYSLOG_TIMESTAMP is not set
#
configs/eagle100/nsh/defconfig
-1
View File
@@ -763,7 +763,6 @@ CONFIG_FS_FAT=y
#
# System Logging
#
# CONFIG_SYSLOG is not set
# CONFIG_SYSLOG_TIMESTAMP is not set
#
configs/eagle100/nxflat/defconfig
-1
View File
@@ -409,7 +409,6 @@ CONFIG_FS_ROMFS=y
# System Logging
#
# CONFIG_SYSLOG is not set
#
# Graphics Support
configs/eagle100/thttpd/defconfig
-1
View File
@@ -654,7 +654,6 @@ CONFIG_FS_ROMFS=y
#
# System Logging
#
# CONFIG_SYSLOG is not set
# CONFIG_SYSLOG_TIMESTAMP is not set
#
configs/efm32-g8xx-stk/nsh/defconfig
-1
View File
@@ -462,7 +462,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
#
# System Logging
#
# CONFIG_SYSLOG is not set
#
# Graphics Support
configs/efm32gg-stk3700/nsh/defconfig
-1
View File
@@ -489,7 +489,6 @@ CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
#
# System Logging
#
# CONFIG_SYSLOG is not set
# CONFIG_SYSLOG_TIMESTAMP is not set
#
configs/ekk-lm3s9b96/nsh/defconfig
-1
View File
@@ -753,7 +753,6 @@ CONFIG_NFS=y
#
# System Logging
#
# CONFIG_SYSLOG is not set
# CONFIG_SYSLOG_TIMESTAMP is not set
#
configs/ez80f910200kitg/ostest/defconfig
-1
View File
@@ -474,7 +474,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
#
# System Logging
#
# CONFIG_SYSLOG is not set
# CONFIG_SYSLOG_TIMESTAMP is not set
#
configs/ez80f910200zco/dhcpd/defconfig
-1
View File
@@ -620,7 +620,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
#
# System Logging
#
# CONFIG_SYSLOG is not set
# CONFIG_SYSLOG_TIMESTAMP is not set
#
configs/ez80f910200zco/httpd/defconfig
-1
View File
@@ -634,7 +634,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
#
# System Logging
#
# CONFIG_SYSLOG is not set
# CONFIG_SYSLOG_TIMESTAMP is not set
#
configs/ez80f910200zco/nettest/defconfig
-1
View File
@@ -626,7 +626,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
#
# System Logging
#
# CONFIG_SYSLOG is not set
# CONFIG_SYSLOG_TIMESTAMP is not set
#
configs/ez80f910200zco/nsh/defconfig
-1
View File
@@ -654,7 +654,6 @@ CONFIG_NET_HOSTNAME=""
#
# System Logging
#
# CONFIG_SYSLOG is not set
# CONFIG_SYSLOG_TIMESTAMP is not set
#

Some files were not shown because too many files have changed in this diff Show More