sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

driver/segger: Move SYSLOG_RTT config from drivers/syslog to drivers/segger

Browse Source 
and remove include/nuttx/syslog/syslog_rtt.h

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-11-28 02:18:45 +08:00 committed by Petro Karashchenko
parent fd268d7123
commit af2b491420
6 changed files with 16 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/segger/Kconfig
View File

@ -85,6 +85,13 @@ config STREAM_RTT
---help---
Use Segger J-Link RTT as a stream input and output.
config SYSLOG_RTT
bool "Log to Segger J-Link RTT"
select SEGGER_RTT
default n
---help---
Use Segger J-Link RTT as a SYSLOG output device.
if SEGGER_SYSVIEW
config SEGGER_SYSVIEW_RTT_CHANNEL

4
drivers/segger/syslog_rtt.c
View File

@ -22,9 +22,7 @@
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <nuttx/syslog/syslog_rtt.h>
#include <nuttx/segger/rtt.h>
#include <SEGGER_RTT.h>

7
drivers/syslog/Kconfig
View File

@ -223,13 +223,6 @@ config SYSLOG_RPMSG
---help---
Use the rpmsg as a SYSLOG output device, send message to remote proc.
config SYSLOG_RTT
bool "Log to Segger J-Link RTT"
select SEGGER_RTT
default n
---help---
Use Segger J-Link RTT as a SYSLOG output device.
config SYSLOG_CONSOLE
bool "Log to /dev/console"
default !ARCH_LOWPUTC && !SYSLOG_CHAR && !RAMLOG_SYSLOG && !SYSLOG_RPMSG && !SYSLOG_RTT

2
drivers/syslog/syslog_channel.c
View File

@ -41,7 +41,7 @@
#endif
#ifdef CONFIG_SYSLOG_RTT
# include <nuttx/syslog/syslog_rtt.h>
# include <nuttx/segger/rtt.h>
#endif
#ifdef CONFIG_ARCH_LOWPUTC

7
include/nuttx/segger/rtt.h
View File

@ -27,6 +27,7 @@
#include <nuttx/config.h>
#include <nuttx/streams.h>
#include <nuttx/syslog/syslog.h>
/****************************************************************************
* Pre-processor Definitions
@ -91,6 +92,12 @@ void lib_rttinstream_open(FAR struct lib_rttinstream_s *stream,
void lib_rttinstream_close(FAR struct lib_rttinstream_s *stream);
#endif
#ifdef CONFIG_SYSLOG_RTT
int syslog_rtt_putc(FAR struct syslog_channel_s *channel, int ch);
ssize_t syslog_rtt_write(FAR struct syslog_channel_s *channel,
FAR const char *buffer, size_t buflen);
#endif
#ifdef __cplusplus
}
#endif

54
include/nuttx/syslog/syslog_rtt.h
View File

@ -1,54 +0,0 @@
/****************************************************************************
* include/nuttx/syslog/syslog_rtt.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
****************************************************************************/
#ifndef __INCLUDE_NUTTX_SYSLOG_SYSLOG_RTT_H
#define __INCLUDE_NUTTX_SYSLOG_SYSLOG_RTT_H
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <nuttx/syslog/syslog.h>
/****************************************************************************
* Public Function Prototypes
****************************************************************************/
#ifdef __cplusplus
#define EXTERN extern "C"
extern "C"
{
#else
#define EXTERN extern
#endif
#ifdef CONFIG_SYSLOG_RTT
int syslog_rtt_putc(FAR struct syslog_channel_s *channel, int ch);
ssize_t syslog_rtt_write(FAR struct syslog_channel_s *channel,
FAR const char *buffer, size_t buflen);
#endif
#undef EXTERN
#ifdef __cplusplus
}
#endif
#endif /* __INCLUDE_NUTTX_SYSLOG_SYSLOG_RTT_H */