This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 04fd98ed720288224261b300be9034ccbe8c5f54 Author: chenzihan1 <[email protected]> AuthorDate: Wed Dec 3 10:37:36 2025 +0800 drivers/syslog/syslog_rpmsg: keep the log in a self-describing buffer The log buffer was handed in by each board through syslog_rpmsg_init_early(), and its indices lived in a private struct, so nothing outside the driver could tell where the log was or how much of it was valid. Put a header (magic, head, tail, size) at the start of the buffer and keep the indices there, so that the content survives a reset when the buffer is in a no-init section and can be read by another core. The driver initializes the header itself on first use, and only resets it when the magic does not match. struct syslog_rpmsg_s and g_syslog_rpmsg are exported so that a platform can point the driver at a shared buffer. syslog_rpmsg_init_early() is removed: drop the buffers from the qemu, goldfish, rtl8730e and sim start-up code and set CONFIG_SYSLOG_RPMSG_BUFSIZE=4096, their old size, in the configs that enable SYSLOG_RPMSG. Signed-off-by: chenzihan1 <[email protected]> Signed-off-by: Bowen Wang <[email protected]> --- arch/arm/src/goldfish/goldfish_boot.c | 14 -- arch/arm/src/qemu/qemu_boot.c | 14 -- arch/arm/src/rtl8730e/rtl8730e_boot.c | 14 -- arch/arm64/src/qemu/qemu_boot.c | 9 - arch/sim/src/sim/sim_head.c | 9 - .../arm/qemu/qemu-armv7a/configs/rpproxy/defconfig | 1 + .../qemu/qemu-armv8a/configs/rpproxy/defconfig | 1 + boards/sim/sim/sim/configs/rpproxy/defconfig | 1 + boards/sim/sim/sim/configs/rpproxy_uart/defconfig | 1 + drivers/drivers_initialize.c | 5 - drivers/syslog/syslog_rpmsg.c | 202 ++++++++------------- include/nuttx/syslog/syslog_rpmsg.h | 44 ++++- 12 files changed, 126 insertions(+), 189 deletions(-) diff --git a/arch/arm/src/goldfish/goldfish_boot.c b/arch/arm/src/goldfish/goldfish_boot.c index b258197e142..3864ef500d6 100644 --- a/arch/arm/src/goldfish/goldfish_boot.c +++ b/arch/arm/src/goldfish/goldfish_boot.c @@ -44,8 +44,6 @@ # include <nuttx/sched_note.h> #endif -#include <nuttx/syslog/syslog_rpmsg.h> - /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ @@ -54,14 +52,6 @@ #define GOLDFISH_PMU_CYCLES_PER_SEC 1000000000 -/**************************************************************************** - * Private Data - ****************************************************************************/ - -#ifdef CONFIG_SYSLOG_RPMSG -static char g_syslog_rpmsg_buf[4096]; -#endif - /**************************************************************************** * Public Functions ****************************************************************************/ @@ -109,10 +99,6 @@ void arm_boot(void) arm_earlyserialinit(); #endif - -#ifdef CONFIG_SYSLOG_RPMSG - syslog_rpmsg_init_early(g_syslog_rpmsg_buf, sizeof(g_syslog_rpmsg_buf)); -#endif } #if defined(CONFIG_ARM_PSCI) && defined(CONFIG_SMP) diff --git a/arch/arm/src/qemu/qemu_boot.c b/arch/arm/src/qemu/qemu_boot.c index f1e51d8d65e..9c2b70ff112 100644 --- a/arch/arm/src/qemu/qemu_boot.c +++ b/arch/arm/src/qemu/qemu_boot.c @@ -52,8 +52,6 @@ # include <nuttx/init.h> #endif -#include <nuttx/syslog/syslog_rpmsg.h> - /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ @@ -62,14 +60,6 @@ #define QEMU_PMU_CYCLES_PER_SEC 1000000000 -/**************************************************************************** - * Private Data - ****************************************************************************/ - -#ifdef CONFIG_SYSLOG_RPMSG -static char g_syslog_rpmsg_buf[4096]; -#endif - /**************************************************************************** * Public Functions ****************************************************************************/ @@ -120,10 +110,6 @@ void arm_boot(void) arm_earlyserialinit(); #endif -#ifdef CONFIG_SYSLOG_RPMSG - syslog_rpmsg_init_early(g_syslog_rpmsg_buf, sizeof(g_syslog_rpmsg_buf)); -#endif - #ifdef CONFIG_BUILD_PROTECTED qemu_userspace(); #endif diff --git a/arch/arm/src/rtl8730e/rtl8730e_boot.c b/arch/arm/src/rtl8730e/rtl8730e_boot.c index 54ca01ca684..6aaee618b0c 100644 --- a/arch/arm/src/rtl8730e/rtl8730e_boot.c +++ b/arch/arm/src/rtl8730e/rtl8730e_boot.c @@ -53,16 +53,6 @@ # include <nuttx/init.h> #endif -#include <nuttx/syslog/syslog_rpmsg.h> - -/**************************************************************************** - * Private Data - ****************************************************************************/ - -#ifdef CONFIG_SYSLOG_RPMSG -static char g_syslog_rpmsg_buf[4096]; -#endif - /**************************************************************************** * Public Functions ****************************************************************************/ @@ -118,10 +108,6 @@ void arm_boot(void) arm_earlyserialinit(); #endif -#ifdef CONFIG_SYSLOG_RPMSG - syslog_rpmsg_init_early(g_syslog_rpmsg_buf, sizeof(g_syslog_rpmsg_buf)); -#endif - #ifdef CONFIG_BUILD_PROTECTED rtl8730e_userspace(); #endif diff --git a/arch/arm64/src/qemu/qemu_boot.c b/arch/arm64/src/qemu/qemu_boot.c index f96bb41eaea..490c2cc3795 100644 --- a/arch/arm64/src/qemu/qemu_boot.c +++ b/arch/arm64/src/qemu/qemu_boot.c @@ -31,7 +31,6 @@ #include <nuttx/debug.h> #include <nuttx/cache.h> -#include <nuttx/syslog/syslog_rpmsg.h> #ifdef CONFIG_LEGACY_PAGING # include <nuttx/page.h> #endif @@ -89,10 +88,6 @@ const struct arm_mmu_config g_mmu_config = .mmu_regions = g_mmu_regions, }; -#ifdef CONFIG_SYSLOG_RPMSG -static char g_syslog_rpmsg_buf[4096]; -#endif - /**************************************************************************** * Public Functions ****************************************************************************/ @@ -195,10 +190,6 @@ void arm64_chip_boot(void) arm64_earlyserialinit(); #endif -#ifdef CONFIG_SYSLOG_RPMSG - syslog_rpmsg_init_early(g_syslog_rpmsg_buf, sizeof(g_syslog_rpmsg_buf)); -#endif - #ifdef CONFIG_ARCH_PERF_EVENTS up_perf_init((void *)CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC); #endif diff --git a/arch/sim/src/sim/sim_head.c b/arch/sim/src/sim/sim_head.c index e41cca08222..935b7056de3 100644 --- a/arch/sim/src/sim/sim_head.c +++ b/arch/sim/src/sim/sim_head.c @@ -38,7 +38,6 @@ #include <nuttx/board.h> #include <nuttx/symtab.h> #include <nuttx/rptun/rptun.h> -#include <nuttx/syslog/syslog_rpmsg.h> #include "sim_internal.h" #ifdef CONFIG_SIM_HCISOCKET @@ -56,10 +55,6 @@ char **g_argv; * Private Data ****************************************************************************/ -#ifdef CONFIG_SYSLOG_RPMSG -static char g_logbuffer[4096]; -#endif - #ifdef CONFIG_ALLSYMS extern struct symtab_s g_allsyms[]; extern int g_nallsyms; @@ -229,10 +224,6 @@ int main(int argc, char **argv, char **envp) allsyms_relocate(); #endif -#ifdef CONFIG_SYSLOG_RPMSG - syslog_rpmsg_init_early(g_logbuffer, sizeof(g_logbuffer)); -#endif - /* Start NuttX */ #ifdef CONFIG_SMP diff --git a/boards/arm/qemu/qemu-armv7a/configs/rpproxy/defconfig b/boards/arm/qemu/qemu-armv7a/configs/rpproxy/defconfig index 7faf9899e9e..f523a4cae2d 100644 --- a/boards/arm/qemu/qemu-armv7a/configs/rpproxy/defconfig +++ b/boards/arm/qemu/qemu-armv7a/configs/rpproxy/defconfig @@ -121,6 +121,7 @@ CONFIG_SYSLOG_PREFIX_STRING="proxy" CONFIG_SYSLOG_PRIORITY=y CONFIG_SYSLOG_PROCESSID=y CONFIG_SYSLOG_RPMSG=y +CONFIG_SYSLOG_RPMSG_BUFSIZE=4096 CONFIG_SYSLOG_RPMSG_SERVER_NAME="server" CONFIG_SYSLOG_TIMESTAMP=y CONFIG_SYSTEM_CUTERM=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/rpproxy/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/rpproxy/defconfig index 85c58460706..6275bec2a37 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/rpproxy/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/rpproxy/defconfig @@ -106,6 +106,7 @@ CONFIG_SYSLOG_PREFIX_STRING="proxy" CONFIG_SYSLOG_PRIORITY=y CONFIG_SYSLOG_PROCESSID=y CONFIG_SYSLOG_RPMSG=y +CONFIG_SYSLOG_RPMSG_BUFSIZE=4096 CONFIG_SYSLOG_RPMSG_SERVER_NAME="server" CONFIG_SYSLOG_TIMESTAMP=y CONFIG_SYSTEM_CUTERM=y diff --git a/boards/sim/sim/sim/configs/rpproxy/defconfig b/boards/sim/sim/sim/configs/rpproxy/defconfig index 3c99cf0680e..42e8fe27d2f 100644 --- a/boards/sim/sim/sim/configs/rpproxy/defconfig +++ b/boards/sim/sim/sim/configs/rpproxy/defconfig @@ -76,6 +76,7 @@ CONFIG_SIM_M32=y CONFIG_SYSLOG_PREFIX=y CONFIG_SYSLOG_PREFIX_STRING="proxy" CONFIG_SYSLOG_RPMSG=y +CONFIG_SYSLOG_RPMSG_BUFSIZE=4096 CONFIG_SYSLOG_RPMSG_SERVER_NAME="server" CONFIG_SYSLOG_TIMESTAMP=y CONFIG_SYSTEM_CLE=y diff --git a/boards/sim/sim/sim/configs/rpproxy_uart/defconfig b/boards/sim/sim/sim/configs/rpproxy_uart/defconfig index e13a5d1c197..8d49a2ff6de 100644 --- a/boards/sim/sim/sim/configs/rpproxy_uart/defconfig +++ b/boards/sim/sim/sim/configs/rpproxy_uart/defconfig @@ -78,6 +78,7 @@ CONFIG_SIM_RAM_UART=y CONFIG_SYSLOG_PREFIX=y CONFIG_SYSLOG_PREFIX_STRING="proxy" CONFIG_SYSLOG_RPMSG=y +CONFIG_SYSLOG_RPMSG_BUFSIZE=4096 CONFIG_SYSLOG_RPMSG_SERVER_NAME="server" CONFIG_SYSLOG_TIMESTAMP=y CONFIG_SYSTEM_CLE=y diff --git a/drivers/drivers_initialize.c b/drivers/drivers_initialize.c index 1bf0094e908..d3d5bf639e9 100644 --- a/drivers/drivers_initialize.c +++ b/drivers/drivers_initialize.c @@ -54,7 +54,6 @@ #include <nuttx/serial/uart_ram.h> #include <nuttx/syslog/syslog.h> #include <nuttx/syslog/syslog_console.h> -#include <nuttx/syslog/syslog_rpmsg.h> #include <nuttx/thermal.h> #include <nuttx/timers/ptp_clock_dummy.h> #include <nuttx/timers/ptp_pps.h> @@ -101,10 +100,6 @@ void drivers_early_initialize(void) { -#if defined(CONFIG_SYSLOG_RPMSG_BUFSIZE) && CONFIG_SYSLOG_RPMSG_BUFSIZE != 0 - syslog_rpmsg_init_early(NULL, 0); -#endif - #ifdef CONFIG_DRIVERS_NOTE note_early_initialize(); #endif diff --git a/drivers/syslog/syslog_rpmsg.c b/drivers/syslog/syslog_rpmsg.c index 3dea2d90f84..1fe6c1d7d0b 100644 --- a/drivers/syslog/syslog_rpmsg.c +++ b/drivers/syslog/syslog_rpmsg.c @@ -38,10 +38,7 @@ #endif #include <nuttx/irq.h> -#include <nuttx/rpmsg/rpmsg.h> -#include <nuttx/spinlock.h> #include <nuttx/syslog/syslog_rpmsg.h> -#include <nuttx/wqueue.h> #include "syslog_rpmsg.h" @@ -57,25 +54,8 @@ #define SYSLOG_RPMSG_COUNT(p) ((p)->head - (p)->tail) #define SYSLOG_RPMSG_SPACE(p) ((p)->size - 1 - SYSLOG_RPMSG_COUNT(p)) -#define SYSLOG_RPMSG_HEADOFF(p) ((p)->head & ((p)->size -1)) -#define SYSLOG_RPMSG_TAILOFF(p) ((p)->tail & ((p)->size -1)) - -/**************************************************************************** - * Private Types - ****************************************************************************/ - -struct syslog_rpmsg_s -{ - volatile size_t head; /* The head index (where data is added) */ - volatile size_t tail; /* The tail index (where data is removed) */ - size_t size; /* Size of the RAM buffer */ - FAR char *buffer; /* Circular RAM buffer */ - struct work_s work; /* Used for deferred callback work */ - - struct rpmsg_endpoint ept; - spinlock_t lock; - bool suspend; -}; +#define SYSLOG_RPMSG_HEADOFF(p) ((p)->head % ((p)->size)) +#define SYSLOG_RPMSG_TAILOFF(p) ((p)->tail % ((p)->size)) /**************************************************************************** * Private Function Prototypes @@ -102,7 +82,7 @@ static ssize_t syslog_rpmsg_file_write(FAR struct file *filep, * Private Data ****************************************************************************/ -static struct syslog_rpmsg_s g_syslog_rpmsg; +struct syslog_rpmsg_s g_syslog_rpmsg; #if CONFIG_SYSLOG_RPMSG_BUFSIZE != 0 # ifdef SYSLOG_RPMSG_BUFFER_SECTION @@ -127,15 +107,44 @@ static const struct file_operations g_syslog_rpmsgfops = * Private Functions ****************************************************************************/ +#if CONFIG_SYSLOG_RPMSG_BUFSIZE != 0 +static void syslog_rpmsg_init_buffer(FAR struct syslog_rpmsg_s *priv) +{ + FAR struct syslog_rpmsg_buffer_header_s *header = + (FAR struct syslog_rpmsg_buffer_header_s *)g_sysbuffer; + irqstate_t flags; + + if (!priv->header) + { + priv->header = header; + spin_lock_init(&priv->lock); + } + + flags = spin_lock_irqsave(&priv->lock); + if (header->magic != SYSLOG_RPMSG_MAGIC_NUMBER) + { + header->head = 0; + header->tail = 0; + header->size = CONFIG_SYSLOG_RPMSG_BUFSIZE - + sizeof(struct syslog_rpmsg_buffer_header_s); + + header->magic = SYSLOG_RPMSG_MAGIC_NUMBER; + } + + spin_unlock_irqrestore(&priv->lock, flags); +} +#endif + static bool syslog_rpmsg_transfer(FAR struct syslog_rpmsg_s *priv, bool wait) { FAR struct syslog_rpmsg_transfer_s *msg = NULL; + FAR struct syslog_rpmsg_buffer_header_s *header = priv->header; irqstate_t flags; uint32_t space; - size_t len_send; - size_t len_end; - size_t len; - size_t off; + uint32_t len_send; + uint32_t len_end; + uint32_t len; + uint32_t off; if (!is_rpmsg_ept_ready(&priv->ept)) { @@ -155,9 +164,9 @@ static bool syslog_rpmsg_transfer(FAR struct syslog_rpmsg_s *priv, bool wait) flags = spin_lock_irqsave(&priv->lock); space -= sizeof(*msg); - len = SYSLOG_RPMSG_COUNT(priv); - off = SYSLOG_RPMSG_TAILOFF(priv); - len_end = priv->size - off; + len = SYSLOG_RPMSG_COUNT(header); + off = SYSLOG_RPMSG_TAILOFF(header); + len_end = header->size - off; if (len > space) { @@ -166,22 +175,22 @@ static bool syslog_rpmsg_transfer(FAR struct syslog_rpmsg_s *priv, bool wait) if (len > len_end) { - memcpy(msg->data, &priv->buffer[off], len_end); - memcpy(msg->data + len_end, priv->buffer, len - len_end); - memset(&priv->buffer[off], 0, len_end); - memset(priv->buffer, 0, len - len_end); + memcpy(msg->data, &header->buffer[off], len_end); + memcpy(msg->data + len_end, header->buffer, len - len_end); + memset(&header->buffer[off], 0, len_end); + memset(header->buffer, 0, len - len_end); } else { - memcpy(msg->data, &priv->buffer[off], len); - memset(&priv->buffer[off], 0, len); + memcpy(msg->data, &header->buffer[off], len); + memset(&header->buffer[off], 0, len); } msg->count = len; - priv->tail += len; + header->tail += len; msg->header.command = SYSLOG_RPMSG_TRANSFER; len_send = len; - len = SYSLOG_RPMSG_COUNT(priv); + len = SYSLOG_RPMSG_COUNT(header); spin_unlock_irqrestore(&priv->lock, flags); if (rpmsg_send_nocopy(&priv->ept, msg, sizeof(*msg) + len_send) < 0) @@ -208,18 +217,31 @@ static void syslog_rpmsg_work(FAR void *priv_) static void syslog_rpmsg_addbuf(FAR struct syslog_rpmsg_s *priv, FAR const char *buffer, size_t len) { + FAR struct syslog_rpmsg_buffer_header_s *header; bool overwritten = false; irqstate_t flags; - size_t offset; - size_t tail; + uint32_t offset; + uint32_t tail; if (len <= 0) { return; } +#if CONFIG_SYSLOG_RPMSG_BUFSIZE != 0 + syslog_rpmsg_init_buffer(priv); +#endif + + header = priv->header; flags = spin_lock_irqsave(&priv->lock); - if (priv->head + len - priv->tail >= priv->size) + + if (len > header->size) + { + buffer += len - header->size; + len = header->size; + } + + if (header->head + len - header->tail >= header->size) { bool ret = false; @@ -240,35 +262,35 @@ static void syslog_rpmsg_addbuf(FAR struct syslog_rpmsg_s *priv, } } - offset = SYSLOG_RPMSG_HEADOFF(priv); - tail = priv->size - offset; + offset = SYSLOG_RPMSG_HEADOFF(header); + tail = header->size - offset; if (len > tail) { - memcpy(&priv->buffer[offset], buffer, tail); - memcpy(priv->buffer, buffer + tail, len - tail); + memcpy(&header->buffer[offset], buffer, tail); + memcpy(header->buffer, buffer + tail, len - tail); } else { - memcpy(&priv->buffer[offset], buffer, len); + memcpy(&header->buffer[offset], buffer, len); } - priv->head += len; + header->head += len; if (overwritten) { - priv->tail = priv->head - priv->size; - priv->buffer[SYSLOG_RPMSG_TAILOFF(priv)] = 0; - priv->tail++; + header->tail = header->head - header->size; + header->buffer[SYSLOG_RPMSG_TAILOFF(header)] = 0; + header->tail++; } if (!priv->suspend && is_rpmsg_ept_ready(&priv->ept)) { clock_t delay = SYSLOG_RPMSG_WORK_DELAY; - size_t space = SYSLOG_RPMSG_SPACE(priv); + uint32_t space = SYSLOG_RPMSG_SPACE(header); /* Start work immediately when data more then 75% and meet last */ - if (space < priv->size / 4) + if (space < header->size / 4) { delay = 0; } @@ -295,7 +317,7 @@ static void syslog_rpmsg_device_created(FAR struct rpmsg_device *rdev, FAR struct syslog_rpmsg_s *priv = priv_; int ret; - if (priv->buffer && strcmp(CONFIG_SYSLOG_RPMSG_SERVER_NAME, + if (priv->header && strcmp(CONFIG_SYSLOG_RPMSG_SERVER_NAME, rpmsg_get_cpuname(rdev)) == 0) { priv->ept.priv = priv; @@ -315,7 +337,7 @@ static void syslog_rpmsg_device_destroy(FAR struct rpmsg_device *rdev, { FAR struct syslog_rpmsg_s *priv = priv_; - if (priv->buffer && strcmp(CONFIG_SYSLOG_RPMSG_SERVER_NAME, + if (priv->header && strcmp(CONFIG_SYSLOG_RPMSG_SERVER_NAME, rpmsg_get_cpuname(rdev)) == 0) { rpmsg_destroy_ept(&priv->ept); @@ -399,74 +421,6 @@ ssize_t syslog_rpmsg_write(FAR syslog_channel_t *channel, return buflen; } -void syslog_rpmsg_init_early(FAR void *buffer, size_t size) -{ - FAR struct syslog_rpmsg_s *priv = &g_syslog_rpmsg; -#ifdef CONFIG_BOARDCTL_RESET_CAUSE - struct boardioc_reset_cause_s cause; - int ret; -#endif - bool is_empty = true; - char prev; - char cur; - size_t i; - -#if CONFIG_SYSLOG_RPMSG_BUFSIZE != 0 - DEBUGASSERT(buffer == NULL && size == 0); - buffer = g_sysbuffer; - size = CONFIG_SYSLOG_RPMSG_BUFSIZE; -#endif - - DEBUGASSERT((size & (size - 1)) == 0); - - priv->buffer = buffer; - priv->size = size; - -#ifdef CONFIG_BOARDCTL_RESET_CAUSE - memset(&cause, 0, sizeof(cause)); - ret = boardctl(BOARDIOC_RESET_CAUSE, (uintptr_t)&cause); - if (ret >= 0 && cause.cause == BOARDIOC_RESETCAUSE_SYS_CHIPPOR) - { - memset(buffer, 0, size); - return; - } -#endif - - prev = priv->buffer[size - 1]; - - for (i = 0; i < size; i++) - { - cur = priv->buffer[i]; - - if (!isprint(cur) && !isspace(cur) && cur != '\0') - { - memset(buffer, 0, size); - is_empty = true; - break; - } - else if (prev && !cur) - { - priv->head = i; - is_empty = false; - } - else if (!prev && cur) - { - priv->tail = i; - } - - prev = cur; - } - - if (is_empty) - { - priv->head = priv->tail = 0; - } - else if (priv->head < priv->tail) - { - priv->head += priv->size; - } -} - int syslog_rpmsg_init(void) { #ifdef CONFIG_SYSLOG_RPMSG_CHARDEV @@ -480,6 +434,10 @@ int syslog_rpmsg_init(void) } #endif +#if CONFIG_SYSLOG_RPMSG_BUFSIZE != 0 + syslog_rpmsg_init_buffer(&g_syslog_rpmsg); +#endif + return rpmsg_register_callback(&g_syslog_rpmsg, syslog_rpmsg_device_created, syslog_rpmsg_device_destroy, diff --git a/include/nuttx/syslog/syslog_rpmsg.h b/include/nuttx/syslog/syslog_rpmsg.h index 3eeb187ab53..87affc51276 100644 --- a/include/nuttx/syslog/syslog_rpmsg.h +++ b/include/nuttx/syslog/syslog_rpmsg.h @@ -28,10 +28,45 @@ ****************************************************************************/ #include <nuttx/config.h> + +#include <nuttx/rpmsg/rpmsg.h> #include <nuttx/syslog/syslog.h> +#include <nuttx/spinlock.h> +#include <nuttx/wqueue.h> /**************************************************************************** - * Public Function Prototypes + * Pre-processor definitions + ****************************************************************************/ + +#define SYSLOG_RPMSG_MAGIC_NUMBER 0x53595250 + +/**************************************************************************** + * Public Types + ****************************************************************************/ + +struct syslog_rpmsg_buffer_header_s +{ + uint32_t magic; + volatile uint32_t head; /* The head index (where data is added) */ + volatile uint32_t tail; /* The tail index (where data is removed) */ + uint32_t size; /* Size of the RAM buffer */ + char buffer[]; /* Circular RAM buffer */ +}; + +#ifdef CONFIG_SYSLOG_RPMSG +struct syslog_rpmsg_s +{ + FAR struct syslog_rpmsg_buffer_header_s *header; /* The trace header */ + struct work_s work; /* Used for deferred callback work */ + + struct rpmsg_endpoint ept; + spinlock_t lock; + bool suspend; +}; +#endif + +/**************************************************************************** + * Public Data ****************************************************************************/ #ifdef __cplusplus @@ -39,8 +74,13 @@ extern "C" { #endif +extern struct syslog_rpmsg_s g_syslog_rpmsg; + +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + #ifdef CONFIG_SYSLOG_RPMSG -void syslog_rpmsg_init_early(FAR void *buffer, size_t size); int syslog_rpmsg_init(void); int syslog_rpmsg_putc(FAR syslog_channel_t *channel, int ch);
