You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2024/02/18 12:09:42 UTC
(nuttx) 02/04: rpmsg/Kconfig: add rpmsg_local_name to replace rptun_local_name
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit fcfd5e8ebfd2c41f01819c0302b75d21d03566d1
Author: Bowen Wang <wa...@xiaomi.com>
AuthorDate: Sun Feb 4 15:04:16 2024 +0800
rpmsg/Kconfig: add rpmsg_local_name to replace rptun_local_name
Because rpmsg service depends on RPMSG, make rpmsg socket use the
RPMSG_LOCAL_NAME
Signed-off-by: Bowen Wang <wa...@xiaomi.com>
---
boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_bt_cpuapp/defconfig | 2 +-
.../arm/nrf53/nrf5340-dk/configs/rpmsghci_nimble_cpuapp/defconfig | 2 +-
boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_sdc_cpunet/defconfig | 2 +-
boards/arm/nrf53/nrf5340-dk/configs/rptun_cpuapp/defconfig | 2 +-
boards/arm/nrf53/nrf5340-dk/configs/rptun_cpunet/defconfig | 2 +-
drivers/rpmsg/Kconfig | 4 ++++
drivers/rptun/Kconfig | 4 ----
drivers/rptun/rptun_dump.c | 2 +-
net/rpmsg/rpmsg_sockif.c | 6 +++---
9 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_bt_cpuapp/defconfig b/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_bt_cpuapp/defconfig
index a179024c3e..39638b17ec 100644
--- a/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_bt_cpuapp/defconfig
+++ b/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_bt_cpuapp/defconfig
@@ -48,9 +48,9 @@ CONFIG_PTHREAD_MUTEX_TYPES=y
CONFIG_RAM_SIZE=524288
CONFIG_RAM_START=0x20000000
CONFIG_RAW_BINARY=y
+CONFIG_RPMSG_LOCAL_CPUNAME="cpuapp"
CONFIG_RPMSG_PING=y
CONFIG_RPTUN=y
-CONFIG_RPTUN_LOCAL_CPUNAME="cpuapp"
CONFIG_RR_INTERVAL=200
CONFIG_SCHED_WAITPID=y
CONFIG_SIG_EVTHREAD=y
diff --git a/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_nimble_cpuapp/defconfig b/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_nimble_cpuapp/defconfig
index ce5ac50a90..534218c210 100644
--- a/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_nimble_cpuapp/defconfig
+++ b/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_nimble_cpuapp/defconfig
@@ -49,9 +49,9 @@ CONFIG_PTHREAD_MUTEX_TYPES=y
CONFIG_RAM_SIZE=524288
CONFIG_RAM_START=0x20000000
CONFIG_RAW_BINARY=y
+CONFIG_RPMSG_LOCAL_CPUNAME="cpuapp"
CONFIG_RPMSG_PING=y
CONFIG_RPTUN=y
-CONFIG_RPTUN_LOCAL_CPUNAME="cpuapp"
CONFIG_RR_INTERVAL=200
CONFIG_SCHED_WAITPID=y
CONFIG_SIG_EVTHREAD=y
diff --git a/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_sdc_cpunet/defconfig b/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_sdc_cpunet/defconfig
index 376f1de4da..2a6c9fc6a8 100644
--- a/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_sdc_cpunet/defconfig
+++ b/boards/arm/nrf53/nrf5340-dk/configs/rpmsghci_sdc_cpunet/defconfig
@@ -38,9 +38,9 @@ CONFIG_PREALLOC_TIMERS=4
CONFIG_RAM_SIZE=65535
CONFIG_RAM_START=0x21000000
CONFIG_RAW_BINARY=y
+CONFIG_RPMSG_LOCAL_CPUNAME="cpunet"
CONFIG_RPMSG_PING=y
CONFIG_RPTUN=y
-CONFIG_RPTUN_LOCAL_CPUNAME="cpunet"
CONFIG_RPTUN_STACKSIZE=2048
CONFIG_RR_INTERVAL=200
CONFIG_SCHED_LPWORK=y
diff --git a/boards/arm/nrf53/nrf5340-dk/configs/rptun_cpuapp/defconfig b/boards/arm/nrf53/nrf5340-dk/configs/rptun_cpuapp/defconfig
index dd661911ba..18f1a08116 100644
--- a/boards/arm/nrf53/nrf5340-dk/configs/rptun_cpuapp/defconfig
+++ b/boards/arm/nrf53/nrf5340-dk/configs/rptun_cpuapp/defconfig
@@ -32,10 +32,10 @@ CONFIG_PREALLOC_TIMERS=4
CONFIG_RAM_SIZE=524288
CONFIG_RAM_START=0x20000000
CONFIG_RAW_BINARY=y
+CONFIG_RPMSG_LOCAL_CPUNAME="cpuapp"
CONFIG_RPMSG_PING=y
CONFIG_RPMSG_UART=y
CONFIG_RPTUN=y
-CONFIG_RPTUN_LOCAL_CPUNAME="cpuapp"
CONFIG_RR_INTERVAL=200
CONFIG_SCHED_WAITPID=y
CONFIG_START_DAY=26
diff --git a/boards/arm/nrf53/nrf5340-dk/configs/rptun_cpunet/defconfig b/boards/arm/nrf53/nrf5340-dk/configs/rptun_cpunet/defconfig
index d7e7830f07..34e3df4512 100644
--- a/boards/arm/nrf53/nrf5340-dk/configs/rptun_cpunet/defconfig
+++ b/boards/arm/nrf53/nrf5340-dk/configs/rptun_cpunet/defconfig
@@ -32,10 +32,10 @@ CONFIG_PREALLOC_TIMERS=4
CONFIG_RAM_SIZE=65535
CONFIG_RAM_START=0x21000000
CONFIG_RAW_BINARY=y
+CONFIG_RPMSG_LOCAL_CPUNAME="cpunet"
CONFIG_RPMSG_PING=y
CONFIG_RPMSG_UART=y
CONFIG_RPTUN=y
-CONFIG_RPTUN_LOCAL_CPUNAME="cpunet"
CONFIG_RPTUN_STACKSIZE=2048
CONFIG_RR_INTERVAL=200
CONFIG_SCHED_WAITPID=y
diff --git a/drivers/rpmsg/Kconfig b/drivers/rpmsg/Kconfig
index 11021524e7..c96a7d5692 100644
--- a/drivers/rpmsg/Kconfig
+++ b/drivers/rpmsg/Kconfig
@@ -10,6 +10,10 @@ config RPMSG
if RPMSG
+config RPMSG_LOCAL_CPUNAME
+ string "Rpmsg Local Cpuname"
+ default LIBC_HOSTNAME
+
config RPMSG_PING
bool "rpmsg ping support"
default n
diff --git a/drivers/rptun/Kconfig b/drivers/rptun/Kconfig
index db2cf2cbea..ae65529417 100644
--- a/drivers/rptun/Kconfig
+++ b/drivers/rptun/Kconfig
@@ -24,10 +24,6 @@ config RPTUN_LOADER
bool "rptun loader support"
default n
-config RPTUN_LOCAL_CPUNAME
- string "rptun local cpuname"
- default LIBC_HOSTNAME
-
config RPTUN_PM
bool "rptun power management"
depends on PM
diff --git a/drivers/rptun/rptun_dump.c b/drivers/rptun/rptun_dump.c
index 9061569e08..b51152f32a 100644
--- a/drivers/rptun/rptun_dump.c
+++ b/drivers/rptun/rptun_dump.c
@@ -115,7 +115,7 @@ void rptun_dump(FAR struct rpmsg_virtio_device *rvdev)
metal_log(METAL_LOG_EMERGENCY,
"Dump rpmsg info between cpu (master: %s)%s <==> %s:\n",
rpmsg_virtio_get_role(rvdev) == RPMSG_HOST ? "yes" : "no",
- CONFIG_RPTUN_LOCAL_CPUNAME, rpmsg_get_cpuname(rdev));
+ CONFIG_RPMSG_LOCAL_CPUNAME, rpmsg_get_cpuname(rdev));
metal_log(METAL_LOG_EMERGENCY, "rpmsg vq RX:\n");
virtqueue_dump(rvdev->rvq);
diff --git a/net/rpmsg/rpmsg_sockif.c b/net/rpmsg/rpmsg_sockif.c
index 7f12350fd1..46eadc27f4 100644
--- a/net/rpmsg/rpmsg_sockif.c
+++ b/net/rpmsg/rpmsg_sockif.c
@@ -673,7 +673,7 @@ static int rpmsg_socket_getsockname(FAR struct socket *psock,
if (ret >= 0)
{
strlcpy(((struct sockaddr_rpmsg *)addr)->rp_cpu,
- CONFIG_RPTUN_LOCAL_CPUNAME, RPMSG_SOCKET_CPU_SIZE);
+ CONFIG_RPMSG_LOCAL_CPUNAME, RPMSG_SOCKET_CPU_SIZE);
}
return ret;
@@ -1374,14 +1374,14 @@ static void rpmsg_socket_path(FAR struct rpmsg_socket_conn_s *conn,
{
snprintf(buf, len,
"rpmsg:[%s:[%s%s]<->%s]",
- CONFIG_RPTUN_LOCAL_CPUNAME, conn->rpaddr.rp_name,
+ CONFIG_RPMSG_LOCAL_CPUNAME, conn->rpaddr.rp_name,
conn->nameid, conn->rpaddr.rp_cpu);
}
else /* Client */
{
snprintf(buf, len,
"rpmsg:[%s<->%s:[%s%s]]",
- CONFIG_RPTUN_LOCAL_CPUNAME, conn->rpaddr.rp_cpu,
+ CONFIG_RPMSG_LOCAL_CPUNAME, conn->rpaddr.rp_cpu,
conn->rpaddr.rp_name, conn->nameid);
}
}