diff --git a/arch/arm/src/nrf53/nrf53_rptun.c b/arch/arm/src/nrf53/nrf53_rptun.c index ba63ab092b0..9e7ba8c20db 100644 --- a/arch/arm/src/nrf53/nrf53_rptun.c +++ b/arch/arm/src/nrf53/nrf53_rptun.c @@ -93,7 +93,6 @@ struct nrf53_rptun_dev_s bool master; struct nrf53_rptun_shmem_s *shmem; char cpuname[RPMSG_NAME_SIZE + 1]; - char shmemname[RPMSG_NAME_SIZE + 1]; }; /**************************************************************************** @@ -456,7 +455,7 @@ static int nrf53_rptun_thread(int argc, char *argv[]) * Public Functions ****************************************************************************/ -int nrf53_rptun_init(const char *shmemname, const char *cpuname) +int nrf53_rptun_init(const char *cpuname) { struct nrf53_rptun_dev_s *dev = &g_rptun_dev; int ret = OK; @@ -488,7 +487,6 @@ int nrf53_rptun_init(const char *shmemname, const char *cpuname) dev->rptun.ops = &g_nrf53_rptun_ops; strncpy(dev->cpuname, cpuname, RPMSG_NAME_SIZE); - strncpy(dev->shmemname, shmemname, RPMSG_NAME_SIZE); ret = rptun_initialize(&dev->rptun); if (ret < 0) diff --git a/arch/arm/src/nrf53/nrf53_rptun.h b/arch/arm/src/nrf53/nrf53_rptun.h index db5eecdb3a2..038dfaf2c61 100644 --- a/arch/arm/src/nrf53/nrf53_rptun.h +++ b/arch/arm/src/nrf53/nrf53_rptun.h @@ -50,7 +50,7 @@ extern "C" * Name: nrf53_rptun_init ****************************************************************************/ -int nrf53_rptun_init(const char *shmemname, const char *cpuname); +int nrf53_rptun_init(const char *cpuname); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/arm/src/stm32h7/stm32_rptun.c b/arch/arm/src/stm32h7/stm32_rptun.c index a879ddd54c7..46a66789efc 100644 --- a/arch/arm/src/stm32h7/stm32_rptun.c +++ b/arch/arm/src/stm32h7/stm32_rptun.c @@ -99,7 +99,6 @@ struct stm32_rptun_dev_s bool master; struct stm32_rptun_shmem_s *shmem; char cpuname[RPMSG_NAME_SIZE + 1]; - char shmemname[RPMSG_NAME_SIZE + 1]; }; /**************************************************************************** @@ -452,7 +451,7 @@ static int stm32_rptun_thread(int argc, char *argv[]) * Public Functions ****************************************************************************/ -int stm32_rptun_init(const char *shmemname, const char *cpuname) +int stm32_rptun_init(const char *cpuname) { struct stm32_rptun_dev_s *dev = &g_rptun_dev; int ret = OK; @@ -482,7 +481,6 @@ int stm32_rptun_init(const char *shmemname, const char *cpuname) dev->rptun.ops = &g_stm32_rptun_ops; strncpy(dev->cpuname, cpuname, RPMSG_NAME_SIZE); - strncpy(dev->shmemname, shmemname, RPMSG_NAME_SIZE); ret = rptun_initialize(&dev->rptun); if (ret < 0) diff --git a/arch/arm/src/stm32h7/stm32_rptun.h b/arch/arm/src/stm32h7/stm32_rptun.h index 40e5e5f6878..9f9e12f2d78 100644 --- a/arch/arm/src/stm32h7/stm32_rptun.h +++ b/arch/arm/src/stm32h7/stm32_rptun.h @@ -50,7 +50,7 @@ extern "C" * Name: stm32_rptun_init ****************************************************************************/ -int stm32_rptun_init(const char *shmemname, const char *cpuname); +int stm32_rptun_init(const char *cpuname); #undef EXTERN #if defined(__cplusplus) diff --git a/arch/risc-v/src/mpfs/mpfs_ihc.c b/arch/risc-v/src/mpfs/mpfs_ihc.c index 7c33bebfaea..6778cd2aa13 100644 --- a/arch/risc-v/src/mpfs/mpfs_ihc.c +++ b/arch/risc-v/src/mpfs/mpfs_ihc.c @@ -80,7 +80,6 @@ /* rptun initialization names */ #define MPFS_RPTUN_CPU_NAME "mpfs-ihc" -#define MPFS_RPTUN_SHMEM_NAME "mpfs-shmem" /* Vring configuration parameters */ @@ -131,7 +130,6 @@ struct mpfs_rptun_dev_s struct mpfs_rptun_shmem_s *shmem; struct simple_addrenv_s addrenv[VRINGS]; char cpuname[RPMSG_NAME_SIZE + 1]; - char shmemname[RPMSG_NAME_SIZE + 1]; }; struct mpfs_queue_table_s @@ -1085,7 +1083,6 @@ static int mpfs_rptun_register_callback(struct rptun_dev_s *dev, * Initializes the rptun device. * * Input Parameters: - * shmemname - Shared mempory name * cpuname - Local CPU name * * Returned Value: @@ -1093,7 +1090,7 @@ static int mpfs_rptun_register_callback(struct rptun_dev_s *dev, * ****************************************************************************/ -static int mpfs_rptun_init(const char *shmemname, const char *cpuname) +static int mpfs_rptun_init(const char *cpuname) { struct mpfs_rptun_dev_s *dev; int ret; @@ -1112,7 +1109,6 @@ static int mpfs_rptun_init(const char *shmemname, const char *cpuname) dev->rptun.ops = &g_mpfs_rptun_ops; strlcpy(dev->cpuname, cpuname, sizeof(dev->cpuname)); - strlcpy(dev->shmemname, shmemname, sizeof(dev->shmemname)); list_add_tail(&g_dev_list, &dev->node); ret = rptun_initialize(&dev->rptun); @@ -1377,7 +1373,7 @@ int mpfs_ihc_init(void) g_shmem.rsc.rpmsg_vdev.status |= VIRTIO_CONFIG_STATUS_DRIVER_OK; } - ret = mpfs_rptun_init(MPFS_RPTUN_SHMEM_NAME, MPFS_RPTUN_CPU_NAME); + ret = mpfs_rptun_init(MPFS_RPTUN_CPU_NAME); if (ret < 0) { ihcerr("ERROR: Not able to init RPTUN\n"); diff --git a/boards/arm/nrf53/nrf5340-dk/src/nrf53_bringup.c b/boards/arm/nrf53/nrf5340-dk/src/nrf53_bringup.c index 785f57931e3..9ec8819969b 100644 --- a/boards/arm/nrf53/nrf5340-dk/src/nrf53_bringup.c +++ b/boards/arm/nrf53/nrf5340-dk/src/nrf53_bringup.c @@ -226,9 +226,9 @@ int nrf53_bringup(void) #ifdef CONFIG_RPTUN #ifdef CONFIG_NRF53_APPCORE - nrf53_rptun_init("nrf53-shmem", "appcore"); + nrf53_rptun_init("appcore"); #else - nrf53_rptun_init("nrf53-shmem", "netcore"); + nrf53_rptun_init("netcore"); #endif #endif diff --git a/boards/arm/nrf53/thingy53/src/nrf53_bringup.c b/boards/arm/nrf53/thingy53/src/nrf53_bringup.c index 13f0c2df5c3..13a94fd2e00 100644 --- a/boards/arm/nrf53/thingy53/src/nrf53_bringup.c +++ b/boards/arm/nrf53/thingy53/src/nrf53_bringup.c @@ -205,9 +205,9 @@ int nrf53_bringup(void) #ifdef CONFIG_RPTUN #ifdef CONFIG_NRF53_APPCORE - nrf53_rptun_init("nrf53-shmem", "appcore"); + nrf53_rptun_init("appcore"); #else - nrf53_rptun_init("nrf53-shmem", "netcore"); + nrf53_rptun_init("netcore"); #endif #endif diff --git a/boards/arm/stm32h7/nucleo-h745zi/src/stm32_bringup.c b/boards/arm/stm32h7/nucleo-h745zi/src/stm32_bringup.c index 3331ae7f8c6..e5a4cfed25b 100644 --- a/boards/arm/stm32h7/nucleo-h745zi/src/stm32_bringup.c +++ b/boards/arm/stm32h7/nucleo-h745zi/src/stm32_bringup.c @@ -104,9 +104,9 @@ int stm32_bringup(void) #ifdef CONFIG_RPTUN # ifdef CONFIG_ARCH_CHIP_STM32H7_CORTEXM7 - stm32_rptun_init("cm4-cm7-shmem", "cm4"); + stm32_rptun_init("cm4"); # else - stm32_rptun_init("cm4-cm7-shmem", "cm7"); + stm32_rptun_init("cm7"); # endif #endif