michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ipc: rpmsg_service: initialize devices at compile time

Browse source 
Initialize devices at compile time, allowing to constify device pointer.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
This commit is contained in:
Gerard Marull-Paretas 2022-08-17 15:30:36 +02:00 • committed by Carles Cufí
commit 745db7afd4
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
subsys/ipc/rpmsg_service/rpmsg_backend.c
View file

@ -50,10 +50,13 @@ struct k_work_q ipm_work_q;
/* End of configuration defines */
#if defined(CONFIG_RPMSG_SERVICE_DUAL_IPM_SUPPORT)
static const struct device *ipm_tx_handle;
static const struct device *ipm_rx_handle;
static const struct device *const ipm_tx_handle =
DEVICE_DT_GET(DT_CHOSEN(zephyr_ipc_tx));
static const struct device *const ipm_rx_handle =
DEVICE_DT_GET(DT_CHOSEN(zephyr_ipc_rx));
#elif defined(CONFIG_RPMSG_SERVICE_SINGLE_IPM_SUPPORT)
static const struct device *ipm_handle;
static const struct device *const ipm_handle =
DEVICE_DT_GET(DT_CHOSEN(zephyr_ipc));
#endif
static metal_phys_addr_t shm_physmap[] = { SHM_START_ADDR };
@ -210,9 +213,6 @@ int rpmsg_backend_init(struct metal_io_region **io, struct virtio_device *vdev)
/* IPM setup */
#if defined(CONFIG_RPMSG_SERVICE_DUAL_IPM_SUPPORT)
ipm_tx_handle = DEVICE_DT_GET(DT_CHOSEN(zephyr_ipc_tx));
ipm_rx_handle = DEVICE_DT_GET(DT_CHOSEN(zephyr_ipc_rx));
if (!device_is_ready(ipm_tx_handle)) {
LOG_ERR("IPM TX device is not ready");
return -ENODEV;
@ -232,7 +232,6 @@ int rpmsg_backend_init(struct metal_io_region **io, struct virtio_device *vdev)
}
#elif defined(CONFIG_RPMSG_SERVICE_SINGLE_IPM_SUPPORT)
ipm_handle = DEVICE_DT_GET(DT_CHOSEN(zephyr_ipc));
if (!device_is_ready(ipm_handle)) {
LOG_ERR("IPM device is not ready");
return -ENODEV;