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

driver/syslog: add config SYSLOG_RPMSG_SERVER_NAME to

Browse Source 
N/A

specified the name of remote proc(rpmsg server)

Change-Id: Ie270d651071e87a40a80ab489597ae18db9814f0
Signed-off-by: Jiuzhu Dong <dongjiuzhu1@xiaomi.com>
This commit is contained in:
Jiuzhu Dong 2021-04-22 22:36:01 +08:00 committed by Alan Carvalho de Assis
parent beed26b6bf
commit ff567124d3
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sim/src/sim/up_head.c
View File

@ -63,7 +63,7 @@ static char g_logbuffer[4096];
int main(int argc, char **argv, char **envp) int main(int argc, char **argv, char **envp)
{ {
#ifdef CONFIG_SYSLOG_RPMSG #ifdef CONFIG_SYSLOG_RPMSG
syslog_rpmsg_init_early("server", g_logbuffer, sizeof(g_logbuffer)); syslog_rpmsg_init_early(g_logbuffer, sizeof(g_logbuffer));
#endif #endif
/* Start NuttX */ /* Start NuttX */

1
boards/sim/sim/sim/configs/rpproxy/defconfig
View File

@ -59,6 +59,7 @@ CONFIG_SIM_M32=y
CONFIG_SYSLOG_PREFIX=y CONFIG_SYSLOG_PREFIX=y
CONFIG_SYSLOG_PREFIX_STRING="proxy: " CONFIG_SYSLOG_PREFIX_STRING="proxy: "
CONFIG_SYSLOG_RPMSG=y CONFIG_SYSLOG_RPMSG=y
CONFIG_SYSLOG_RPMSG_SERVER_NAME="server"
CONFIG_SYSLOG_TIMESTAMP=y CONFIG_SYSLOG_TIMESTAMP=y
CONFIG_SYSTEM_CLE=y CONFIG_SYSTEM_CLE=y
CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH=y

7
drivers/syslog/Kconfig
View File

@ -215,6 +215,13 @@ config SYSLOG_RPMSG
---help--- ---help---
Use the rpmsg as a SYSLOG output device, send message to remote proc. Use the rpmsg as a SYSLOG output device, send message to remote proc.
config SYSLOG_RPMSG_SERVER_NAME
string "The name of Syslog Rpmsg Server"
depends on SYSLOG_RPMSG
---help---
The proc name of rpmsg server. Client sends message to
specified name of remote proc.
config SYSLOG_DEFAULT config SYSLOG_DEFAULT
bool "Default SYSLOG device" bool "Default SYSLOG device"
---help--- ---help---

11
drivers/syslog/syslog_rpmsg.c
View File

@ -62,7 +62,6 @@ struct syslog_rpmsg_s
struct work_s work; /* Used for deferred callback work */ struct work_s work; /* Used for deferred callback work */
struct rpmsg_endpoint ept; struct rpmsg_endpoint ept;
FAR const char *cpuname;
bool suspend; bool suspend;
bool transfer; /* The transfer flag */ bool transfer; /* The transfer flag */
ssize_t trans_len; /* The data length when transfer */ ssize_t trans_len; /* The data length when transfer */
@ -210,7 +209,8 @@ static void syslog_rpmsg_device_created(FAR struct rpmsg_device *rdev,
FAR struct syslog_rpmsg_s *priv = priv_; FAR struct syslog_rpmsg_s *priv = priv_;
int ret; int ret;
if (priv->buffer && strcmp(priv->cpuname, rpmsg_get_cpuname(rdev)) == 0) if (priv->buffer && strcmp(CONFIG_SYSLOG_RPMSG_SERVER_NAME,
rpmsg_get_cpuname(rdev)) == 0)
{ {
priv->ept.priv = priv; priv->ept.priv = priv;
@ -230,7 +230,8 @@ static void syslog_rpmsg_device_destroy(FAR struct rpmsg_device *rdev,
{ {
FAR struct syslog_rpmsg_s *priv = priv_; FAR struct syslog_rpmsg_s *priv = priv_;
if (priv->buffer && strcmp(priv->cpuname, rpmsg_get_cpuname(rdev)) == 0) if (priv->buffer && strcmp(CONFIG_SYSLOG_RPMSG_SERVER_NAME,
rpmsg_get_cpuname(rdev)) == 0)
{ {
rpmsg_destroy_ept(&priv->ept); rpmsg_destroy_ept(&priv->ept);
} }
@ -343,15 +344,13 @@ ssize_t syslog_rpmsg_write(FAR struct syslog_channel_s *channel,
return buflen; return buflen;
} }
void syslog_rpmsg_init_early(FAR const char *cpuname, FAR void *buffer, void syslog_rpmsg_init_early(FAR void *buffer, size_t size)
size_t size)
{ {
FAR struct syslog_rpmsg_s *priv = &g_syslog_rpmsg; FAR struct syslog_rpmsg_s *priv = &g_syslog_rpmsg;
char prev, cur; char prev, cur;
size_t i; size_t i;
size_t j; size_t j;
priv->cpuname = cpuname;
priv->buffer = buffer; priv->buffer = buffer;
priv->size = size; priv->size = size;

3
include/nuttx/syslog/syslog_rpmsg.h
View File

@ -40,8 +40,7 @@ extern "C"
#endif #endif
#ifdef CONFIG_SYSLOG_RPMSG #ifdef CONFIG_SYSLOG_RPMSG
void syslog_rpmsg_init_early(FAR const char *cpu_name, FAR void *buffer, void syslog_rpmsg_init_early(FAR void *buffer, size_t size);
size_t size);
int syslog_rpmsg_init(void); int syslog_rpmsg_init(void);
int syslog_rpmsg_putc(FAR struct syslog_channel_s *channel, int ch); int syslog_rpmsg_putc(FAR struct syslog_channel_s *channel, int ch);