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 1eedefaeb0fd1b89a091c7f5b0860b4b624beb7b Author: chenzihan1 <[email protected]> AuthorDate: Tue Sep 15 14:39:30 2026 +0800 drivers/syslog/syslog_rpmsg: remove the suspend/resume commands Nothing sends SYSLOG_RPMSG_SUSPEND or SYSLOG_RPMSG_RESUME. Their only effect was the per-device suspend flag, which stops log delivery until a RESUME arrives; a lost RESUME stalls the log path for good. Drop both commands and the flag, and renumber SYNC from 3 to 1. This changes the wire value of SYNC, so both ends of the endpoint must be updated together. Signed-off-by: chenzihan1 <[email protected]> Signed-off-by: Bowen Wang <[email protected]> --- drivers/syslog/syslog_rpmsg.c | 16 +++------------- drivers/syslog/syslog_rpmsg.h | 4 +--- include/nuttx/syslog/syslog_rpmsg.h | 1 - 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/drivers/syslog/syslog_rpmsg.c b/drivers/syslog/syslog_rpmsg.c index 61ff18e4b19..f8c6bc847ea 100644 --- a/drivers/syslog/syslog_rpmsg.c +++ b/drivers/syslog/syslog_rpmsg.c @@ -285,7 +285,7 @@ static void syslog_rpmsg_addbuf(FAR struct syslog_rpmsg_s *priv, header->tail = (header->head + 1) % header->size; } - if (!priv->suspend && is_rpmsg_ept_ready(&priv->ept)) + if (is_rpmsg_ept_ready(&priv->ept)) { clock_t delay = SYSLOG_RPMSG_WORK_DELAY; uint32_t space = SYSLOG_RPMSG_SPACE(header); @@ -356,17 +356,7 @@ static int syslog_rpmsg_ept_cb(FAR struct rpmsg_endpoint *ept, FAR struct syslog_rpmsg_s *priv = priv_; FAR struct syslog_rpmsg_header_s *header = data; - if (header->command == SYSLOG_RPMSG_SUSPEND) - { - work_cancel(HPWORK, &priv->work); - priv->suspend = true; - } - else if (header->command == SYSLOG_RPMSG_RESUME) - { - priv->suspend = false; - work_queue(HPWORK, &priv->work, syslog_rpmsg_work, priv, 0); - } - else if (header->command == SYSLOG_RPMSG_SYNC) + if (header->command == SYSLOG_RPMSG_SYNC) { syslog_rpmsg_transfer(priv, true); rpmsg_send(ept, data, len); @@ -387,7 +377,7 @@ static ssize_t syslog_rpmsg_file_read(FAR struct file *filep, DEBUGASSERT(inode->i_private); priv = inode->i_private; - if (!priv->suspend && is_rpmsg_ept_ready(&priv->ept)) + if (is_rpmsg_ept_ready(&priv->ept)) { work_queue(HPWORK, &priv->work, syslog_rpmsg_work, priv, 0); } diff --git a/drivers/syslog/syslog_rpmsg.h b/drivers/syslog/syslog_rpmsg.h index 84206f2fa38..246af32da2d 100644 --- a/drivers/syslog/syslog_rpmsg.h +++ b/drivers/syslog/syslog_rpmsg.h @@ -30,9 +30,7 @@ #define SYSLOG_RPMSG_EPT_NAME "rpmsg-syslog" #define SYSLOG_RPMSG_TRANSFER 0 -#define SYSLOG_RPMSG_SUSPEND 1 -#define SYSLOG_RPMSG_RESUME 2 -#define SYSLOG_RPMSG_SYNC 3 +#define SYSLOG_RPMSG_SYNC 1 /**************************************************************************** * Public Types diff --git a/include/nuttx/syslog/syslog_rpmsg.h b/include/nuttx/syslog/syslog_rpmsg.h index 7cd1863781f..346b73db8f4 100644 --- a/include/nuttx/syslog/syslog_rpmsg.h +++ b/include/nuttx/syslog/syslog_rpmsg.h @@ -63,7 +63,6 @@ struct syslog_rpmsg_s struct rpmsg_endpoint ept; spinlock_t lock; - bool suspend; }; #endif
