From 07c986905dcd87dff6443af984703878d2b87911 Mon Sep 17 00:00:00 2001 From: Yongrong Wang Date: Fri, 15 Nov 2024 10:13:54 +0800 Subject: [PATCH] sim/configs/rpserver/rpproxy_virtio: Change the sim 32bit to 64bit compilation 1.macOS doesn't support 32bit anymore(CONFIG_SIM_M32=y) 2.fix b4bit compile warning: CC: ioexpander/ioe_rpmsg.c ioexpander/ioe_rpmsg.c:368:14: warning: cast to 'void *' from smaller integer type 'int' [-Wint-to-void-pointer-cast] return (FAR void *)(ret + 1); ^~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Yongrong Wang --- boards/sim/sim/sim/configs/rpproxy_virtio/defconfig | 1 - boards/sim/sim/sim/configs/rpserver_virtio/defconfig | 1 - drivers/ioexpander/ioe_rpmsg.c | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/boards/sim/sim/sim/configs/rpproxy_virtio/defconfig b/boards/sim/sim/sim/configs/rpproxy_virtio/defconfig index f0bfad2d0f..4530dc4c26 100644 --- a/boards/sim/sim/sim/configs/rpproxy_virtio/defconfig +++ b/boards/sim/sim/sim/configs/rpproxy_virtio/defconfig @@ -68,7 +68,6 @@ CONFIG_SCHED_WAITPID=y CONFIG_SENSORS=y CONFIG_SENSORS_RPMSG=y CONFIG_SIG_DEFAULT=y -CONFIG_SIM_M32=y CONFIG_SYSLOG_PREFIX=y CONFIG_SYSLOG_PREFIX_STRING="proxy" CONFIG_SYSLOG_RPMSG=y diff --git a/boards/sim/sim/sim/configs/rpserver_virtio/defconfig b/boards/sim/sim/sim/configs/rpserver_virtio/defconfig index 58c859085e..3a2686b63d 100644 --- a/boards/sim/sim/sim/configs/rpserver_virtio/defconfig +++ b/boards/sim/sim/sim/configs/rpserver_virtio/defconfig @@ -86,7 +86,6 @@ CONFIG_SENSORS=y CONFIG_SENSORS_RPMSG=y CONFIG_SIG_DEFAULT=y CONFIG_SIM_HOSTFS=y -CONFIG_SIM_M32=y CONFIG_SIM_NETDEV=y CONFIG_SIM_NET_BRIDGE=y CONFIG_SIM_RPMSG_MASTER=y diff --git a/drivers/ioexpander/ioe_rpmsg.c b/drivers/ioexpander/ioe_rpmsg.c index 9fe562798a..ed68bd34c7 100644 --- a/drivers/ioexpander/ioe_rpmsg.c +++ b/drivers/ioexpander/ioe_rpmsg.c @@ -365,7 +365,7 @@ static void *ioe_rpmsg_attach(FAR struct ioexpander_dev_s *dev, (struct ioe_rpmsg_header_s *)&msg, sizeof(msg)); if (ret >= 0) { - return (FAR void *)(ret + 1); + return (FAR void *)((uintptr_t)(ret + 1)); } return NULL;