Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions drivers/rpmsg/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ if(CONFIG_RPMSG)

list(APPEND SRCS rpmsg.c)

if(CONFIG_RPMSG_CHAR)
list(APPEND SRCS rpmsg_char.c)
endif()

if(CONFIG_RPMSG_TRACE)
list(APPEND SRCS rpmsg_trace.c)
endif()
Expand Down
13 changes: 13 additions & 0 deletions drivers/rpmsg/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,19 @@ config RPMSG

if RPMSG

config RPMSG_CHAR
bool "rpmsg char support"
default n
---help---
User can use the /dev/rpmsg/<cpuname> to create the
endpoint and then use /dev/rpmsg-<name> to communicate with
remote processor.

config RPMSG_CHAR_NPOLLWAITERS
int "rpmsg char number of the poll waiters"
default 2
depends on RPMSG_CHAR

config RPMSG_WQUEUE_GLOBAL
bool "rpmsg global work queue"
default n
Expand Down
4 changes: 4 additions & 0 deletions drivers/rpmsg/Make.defs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ ifeq ($(CONFIG_RPMSG),y)

CSRCS += rpmsg.c

ifeq ($(CONFIG_RPMSG_CHAR),y)
CSRCS += rpmsg_char.c
endif

ifeq ($(CONFIG_RPMSG_TRACE),y)
CSRCS += rpmsg_trace.c
endif
Expand Down
18 changes: 17 additions & 1 deletion drivers/rpmsg/rpmsg.c
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,18 @@ static int rpmsg_dev_ioctl_(FAR struct rpmsg_s *rpmsg, int cmd,
case RPMSGIOC_RELEASE_WAKELOCK:
ret = rpmsg_wakelock(&rpmsg->wakelock, cmd, arg);
break;
#endif
#ifdef CONFIG_RPMSG_CHAR
case RPMSG_CREATE_EPT_IOCTL:
case RPMSG_CREATE_DEV_IOCTL:
ret = rpmsg_char_create_eptdev(
&rpmsg->chr, (FAR const struct rpmsg_endpoint_info *)arg);
break;
case RPMSG_RELEASE_DEV_IOCTL:
rpmsg_char_destroy_eptdev(
&rpmsg->chr, (FAR const struct rpmsg_endpoint_info *)arg);
ret = OK;
break;
#endif
default:
if (rpmsg->ops->ioctl)
Expand Down Expand Up @@ -743,9 +755,12 @@ int rpmsg_register(FAR const char *path, FAR struct rpmsg_s *rpmsg,
return ret;
}

rpmsg_char_init(&rpmsg->chr);

ret = register_driver(path, &g_rpmsg_dev_ops, 0200, rpmsg);
if (ret < 0)
{
rpmsg_char_deinit(&rpmsg->chr);
metal_finish();
return ret;
}
Expand All @@ -754,6 +769,7 @@ int rpmsg_register(FAR const char *path, FAR struct rpmsg_s *rpmsg,
if (ret < 0)
{
unregister_driver(path);
rpmsg_char_deinit(&rpmsg->chr);
metal_finish();
return ret;
}
Expand Down Expand Up @@ -791,7 +807,7 @@ void rpmsg_unregister(FAR const char *path, FAR struct rpmsg_s *rpmsg)
rpmsg_deinit_workrx(rpmsg);
nxrmutex_destroy(&rpmsg->lock);
unregister_driver(path);

rpmsg_char_deinit(&rpmsg->chr);
metal_finish();
}

Expand Down
4 changes: 4 additions & 0 deletions drivers/rpmsg/rpmsg.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include <nuttx/rpmsg/rpmsg.h>
#include <nuttx/wqueue.h>

#include "rpmsg_char.h"
#include "rpmsg_ping.h"

/****************************************************************************
Expand Down Expand Up @@ -72,6 +73,9 @@ struct rpmsg_s
#endif
#ifdef CONFIG_RPMSG_WAKELOCK
struct rpmsg_endpoint wakelock;
#endif
#ifdef CONFIG_RPMSG_CHAR
struct rpmsg_char_s chr;
#endif
atomic_t signals;
#if CONFIG_RPMSG_PANIC_DUMP_LEVEL > RPMSG_PANIC_DUMP_DISABLE
Expand Down
Loading
Loading