From 7c839d7a09afae53f3bb8d097189b6450d0b6d43 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Mon, 19 Feb 2024 23:07:41 +0800 Subject: [PATCH] rptun: Remove include/nuttx/rptun/openamp.h and use include/nuttx/rpmsg/rpmsg.h instead Signed-off-by: Xiang Xiao --- arch/risc-v/src/k230/k230_rptun.c | 1 - arch/risc-v/src/mpfs/mpfs_ihc.c | 1 - arch/risc-v/src/qemu-rv/qemu_rv_rptun.c | 1 - drivers/clk/clk_rpmsg.c | 2 +- drivers/input/uinput.c | 2 +- drivers/ioexpander/ioe_rpmsg.c | 2 +- drivers/misc/rpmsgblk.c | 2 +- drivers/misc/rpmsgblk_server.c | 2 +- drivers/misc/rpmsgdev.c | 2 +- drivers/misc/rpmsgdev_server.c | 2 +- drivers/mtd/rpmsgmtd.c | 2 +- drivers/mtd/rpmsgmtd_server.c | 2 +- drivers/net/rpmsgdrv.c | 2 +- drivers/power/supply/regulator_rpmsg.c | 2 +- drivers/reset/reset_rpmsg.c | 2 +- drivers/sensors/sensor_rpmsg.c | 2 +- drivers/serial/uart_rpmsg.c | 2 +- drivers/syslog/syslog_rpmsg.c | 2 +- drivers/syslog/syslog_rpmsg_server.c | 2 +- drivers/timers/rpmsg_rtc.c | 2 +- drivers/usrsock/usrsock_rpmsg.c | 2 +- drivers/usrsock/usrsock_rpmsg_server.c | 2 +- drivers/wireless/bluetooth/bt_rpmsghci.c | 2 +- drivers/wireless/bluetooth/bt_rpmsghci_server.c | 2 +- fs/rpmsgfs/rpmsgfs_client.c | 2 +- fs/rpmsgfs/rpmsgfs_server.c | 2 +- include/nuttx/rpmsg/rpmsg.h | 5 ++++- net/rpmsg/rpmsg_sockif.c | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/arch/risc-v/src/k230/k230_rptun.c b/arch/risc-v/src/k230/k230_rptun.c index f511d0d4a2..980afb9565 100644 --- a/arch/risc-v/src/k230/k230_rptun.c +++ b/arch/risc-v/src/k230/k230_rptun.c @@ -42,7 +42,6 @@ #include #include -#include #include #include #include diff --git a/arch/risc-v/src/mpfs/mpfs_ihc.c b/arch/risc-v/src/mpfs/mpfs_ihc.c index 736571a6ee..621b2d2619 100644 --- a/arch/risc-v/src/mpfs/mpfs_ihc.c +++ b/arch/risc-v/src/mpfs/mpfs_ihc.c @@ -42,7 +42,6 @@ #include #include -#include #include #include #include diff --git a/arch/risc-v/src/qemu-rv/qemu_rv_rptun.c b/arch/risc-v/src/qemu-rv/qemu_rv_rptun.c index 0f19216281..98e751417b 100644 --- a/arch/risc-v/src/qemu-rv/qemu_rv_rptun.c +++ b/arch/risc-v/src/qemu-rv/qemu_rv_rptun.c @@ -42,7 +42,6 @@ #include #include -#include #include #include #include diff --git a/drivers/clk/clk_rpmsg.c b/drivers/clk/clk_rpmsg.c index 66e5a62574..69f86a65e4 100644 --- a/drivers/clk/clk_rpmsg.c +++ b/drivers/clk/clk_rpmsg.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include /**************************************************************************** diff --git a/drivers/input/uinput.c b/drivers/input/uinput.c index fa4425978e..ed770932cc 100644 --- a/drivers/input/uinput.c +++ b/drivers/input/uinput.c @@ -35,7 +35,7 @@ #include #ifdef CONFIG_UINPUT_RPMSG -# include +# include #endif /**************************************************************************** diff --git a/drivers/ioexpander/ioe_rpmsg.c b/drivers/ioexpander/ioe_rpmsg.c index 29a589bf65..5242eab05d 100644 --- a/drivers/ioexpander/ioe_rpmsg.c +++ b/drivers/ioexpander/ioe_rpmsg.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/drivers/misc/rpmsgblk.c b/drivers/misc/rpmsgblk.c index 0db857ef1a..ef2c438d5e 100644 --- a/drivers/misc/rpmsgblk.c +++ b/drivers/misc/rpmsgblk.c @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include "rpmsgblk.h" diff --git a/drivers/misc/rpmsgblk_server.c b/drivers/misc/rpmsgblk_server.c index 6d0cfed985..69b3deec12 100644 --- a/drivers/misc/rpmsgblk_server.c +++ b/drivers/misc/rpmsgblk_server.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include "inode.h" #include "rpmsgblk.h" diff --git a/drivers/misc/rpmsgdev.c b/drivers/misc/rpmsgdev.c index 7e13875d31..1a10fcee79 100644 --- a/drivers/misc/rpmsgdev.c +++ b/drivers/misc/rpmsgdev.c @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/misc/rpmsgdev_server.c b/drivers/misc/rpmsgdev_server.c index 3b2e2c02ea..03345266b3 100644 --- a/drivers/misc/rpmsgdev_server.c +++ b/drivers/misc/rpmsgdev_server.c @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include "rpmsgdev.h" diff --git a/drivers/mtd/rpmsgmtd.c b/drivers/mtd/rpmsgmtd.c index 541f1aa2bd..8545b24f69 100644 --- a/drivers/mtd/rpmsgmtd.c +++ b/drivers/mtd/rpmsgmtd.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include "rpmsgmtd.h" diff --git a/drivers/mtd/rpmsgmtd_server.c b/drivers/mtd/rpmsgmtd_server.c index c0b5218a74..d583c1a790 100644 --- a/drivers/mtd/rpmsgmtd_server.c +++ b/drivers/mtd/rpmsgmtd_server.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include "rpmsgmtd.h" diff --git a/drivers/net/rpmsgdrv.c b/drivers/net/rpmsgdrv.c index bbd5b9e53f..17dd734fa4 100644 --- a/drivers/net/rpmsgdrv.c +++ b/drivers/net/rpmsgdrv.c @@ -39,7 +39,7 @@ #include #include #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/drivers/power/supply/regulator_rpmsg.c b/drivers/power/supply/regulator_rpmsg.c index 5994949464..ba6f431e5d 100644 --- a/drivers/power/supply/regulator_rpmsg.c +++ b/drivers/power/supply/regulator_rpmsg.c @@ -34,7 +34,7 @@ #include #include #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/drivers/reset/reset_rpmsg.c b/drivers/reset/reset_rpmsg.c index a16e887d44..4d18ea1c06 100644 --- a/drivers/reset/reset_rpmsg.c +++ b/drivers/reset/reset_rpmsg.c @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include diff --git a/drivers/sensors/sensor_rpmsg.c b/drivers/sensors/sensor_rpmsg.c index 157c8464ce..5ad5790607 100644 --- a/drivers/sensors/sensor_rpmsg.c +++ b/drivers/sensors/sensor_rpmsg.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/drivers/serial/uart_rpmsg.c b/drivers/serial/uart_rpmsg.c index 1504c38e7e..30b5d0ec73 100644 --- a/drivers/serial/uart_rpmsg.c +++ b/drivers/serial/uart_rpmsg.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/syslog/syslog_rpmsg.c b/drivers/syslog/syslog_rpmsg.c index fa624f801f..6cbce4a010 100644 --- a/drivers/syslog/syslog_rpmsg.c +++ b/drivers/syslog/syslog_rpmsg.c @@ -36,7 +36,7 @@ #endif #include -#include +#include #include #include diff --git a/drivers/syslog/syslog_rpmsg_server.c b/drivers/syslog/syslog_rpmsg_server.c index 3795023e57..79619a9135 100644 --- a/drivers/syslog/syslog_rpmsg_server.c +++ b/drivers/syslog/syslog_rpmsg_server.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include "syslog.h" diff --git a/drivers/timers/rpmsg_rtc.c b/drivers/timers/rpmsg_rtc.c index 58a25504ec..477adc0236 100644 --- a/drivers/timers/rpmsg_rtc.c +++ b/drivers/timers/rpmsg_rtc.c @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/usrsock/usrsock_rpmsg.c b/drivers/usrsock/usrsock_rpmsg.c index 25e188a861..dca23d4204 100644 --- a/drivers/usrsock/usrsock_rpmsg.c +++ b/drivers/usrsock/usrsock_rpmsg.c @@ -23,7 +23,7 @@ ****************************************************************************/ #include -#include +#include #include #include diff --git a/drivers/usrsock/usrsock_rpmsg_server.c b/drivers/usrsock/usrsock_rpmsg_server.c index df8657fb62..1b9d77ecd2 100644 --- a/drivers/usrsock/usrsock_rpmsg_server.c +++ b/drivers/usrsock/usrsock_rpmsg_server.c @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #ifdef CONFIG_NETDEV_WIRELESS_IOCTL #include diff --git a/drivers/wireless/bluetooth/bt_rpmsghci.c b/drivers/wireless/bluetooth/bt_rpmsghci.c index a472436b3d..1936354bb1 100644 --- a/drivers/wireless/bluetooth/bt_rpmsghci.c +++ b/drivers/wireless/bluetooth/bt_rpmsghci.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include "bt_rpmsghci.h" diff --git a/drivers/wireless/bluetooth/bt_rpmsghci_server.c b/drivers/wireless/bluetooth/bt_rpmsghci_server.c index be3e54b47b..bbebb13096 100644 --- a/drivers/wireless/bluetooth/bt_rpmsghci_server.c +++ b/drivers/wireless/bluetooth/bt_rpmsghci_server.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include "bt_rpmsghci.h" diff --git a/fs/rpmsgfs/rpmsgfs_client.c b/fs/rpmsgfs/rpmsgfs_client.c index 2fda6cfe14..1b863752cf 100644 --- a/fs/rpmsgfs/rpmsgfs_client.c +++ b/fs/rpmsgfs/rpmsgfs_client.c @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include "rpmsgfs.h" diff --git a/fs/rpmsgfs/rpmsgfs_server.c b/fs/rpmsgfs/rpmsgfs_server.c index c348e434a7..c478f4ac84 100644 --- a/fs/rpmsgfs/rpmsgfs_server.c +++ b/fs/rpmsgfs/rpmsgfs_server.c @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include "rpmsgfs.h" #include "fs_heap.h" diff --git a/include/nuttx/rpmsg/rpmsg.h b/include/nuttx/rpmsg/rpmsg.h index e942c5987a..08435ef95f 100644 --- a/include/nuttx/rpmsg/rpmsg.h +++ b/include/nuttx/rpmsg/rpmsg.h @@ -122,17 +122,20 @@ void rpmsg_unregister_callback(FAR void *priv, rpmsg_dev_cb_t device_destroy, rpmsg_match_cb_t ns_match, rpmsg_bind_cb_t ns_bind); + void rpmsg_ns_bind(FAR struct rpmsg_device *rdev, FAR const char *name, uint32_t dest); void rpmsg_ns_unbind(FAR struct rpmsg_device *rdev, FAR const char *name, uint32_t dest); + void rpmsg_device_created(FAR struct rpmsg_s *rpmsg); void rpmsg_device_destory(FAR struct rpmsg_s *rpmsg); + int rpmsg_register(FAR const char *path, FAR struct rpmsg_s *rpmsg, FAR const struct rpmsg_ops_s *ops); void rpmsg_unregister(FAR const char *path, FAR struct rpmsg_s *rpmsg); -int rpmsg_ioctl(FAR const char *cpuname, int cmd, unsigned long arg); +int rpmsg_ioctl(FAR const char *cpuname, int cmd, unsigned long arg); int rpmsg_panic(FAR const char *cpuname); void rpmsg_dump_all(void); diff --git a/net/rpmsg/rpmsg_sockif.c b/net/rpmsg/rpmsg_sockif.c index f0626f7c8b..d59cd710d2 100644 --- a/net/rpmsg/rpmsg_sockif.c +++ b/net/rpmsg/rpmsg_sockif.c @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include