OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

syslog/rpmsg: fix the naming conflict of function 'syslog_rpmsg_putc'. 

Change-Id: I3f89bfed71edb85bc3006446c1f9141e95202b5c
Signed-off-by: zhongan <zhongan@xiaomi.com>
This commit is contained in:
zhongan 2020-04-07 20:39:53 +08:00 committed by Alan Carvalho de Assis
parent 6548b41cab
commit ab566de77a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/syslog/syslog_rpmsg.c
View File

@ -88,8 +88,8 @@ struct syslog_rpmsg_s
****************************************************************************/
static void syslog_rpmsg_work(FAR void *priv_);
static void syslog_rpmsg_putc(FAR struct syslog_rpmsg_s *priv, int ch,
bool last);
static void syslog_rpmsg_putchar(FAR struct syslog_rpmsg_s *priv, int ch,
bool last);
static int syslog_rpmsg_flush(void);
static ssize_t syslog_rpmsg_write(FAR const char *buffer, size_t buflen);
static void syslog_rpmsg_device_created(FAR struct rpmsg_device *rdev,
@ -177,8 +177,8 @@ static void syslog_rpmsg_work(FAR void *priv_)
rpmsg_send_nocopy(&priv->ept, msg, sizeof(*msg) + len);
}
static void syslog_rpmsg_putc(FAR struct syslog_rpmsg_s *priv, int ch,
bool last)
static void syslog_rpmsg_putchar(FAR struct syslog_rpmsg_s *priv, int ch,
bool last)
{
if (B2C_REM(priv->head) == 0)
{
@ -244,7 +244,7 @@ static ssize_t syslog_rpmsg_write(FAR const char *buffer, size_t buflen)
flags = enter_critical_section();
for (nwritten = 1; nwritten <= buflen; nwritten++)
{
syslog_rpmsg_putc(priv, *buffer++, nwritten == buflen);
syslog_rpmsg_putchar(priv, *buffer++, nwritten == buflen);
}
leave_critical_section(flags);
@ -352,7 +352,7 @@ int syslog_rpmsg_putc(int ch)
irqstate_t flags;
flags = enter_critical_section();
syslog_rpmsg_putc(priv, ch, true);
syslog_rpmsg_putchar(priv, ch, true);
leave_critical_section(flags);
return ch;