From a0538270841987b87f44164548d6c2696a05fdee Mon Sep 17 00:00:00 2001 From: Jim Mussared Date: Wed, 20 Jul 2022 17:17:34 +1000 Subject: [PATCH] extmod/network_ninaw10: Move ninaw10 root pointer registrations here. Originally in drivers/ninaw10/nina_wifi_bsp.c but that isn't a QSTR source. Also remove outdated commment about root pointers in mpconfigport.h. Signed-off-by: Jim Mussared --- drivers/ninaw10/nina_wifi_bsp.c | 4 ---- extmod/network_ninaw10.c | 4 ++++ ports/rp2/mpconfigport.h | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/ninaw10/nina_wifi_bsp.c b/drivers/ninaw10/nina_wifi_bsp.c index d11e139705..a65ef7fd86 100644 --- a/drivers/ninaw10/nina_wifi_bsp.c +++ b/drivers/ninaw10/nina_wifi_bsp.c @@ -150,8 +150,4 @@ int nina_bsp_spi_transfer(const uint8_t *tx_buf, uint8_t *rx_buf, uint32_t size) return 0; } -MP_REGISTER_ROOT_POINTER(struct _machine_spi_obj_t *mp_wifi_spi); -MP_REGISTER_ROOT_POINTER(struct _machine_timer_obj_t *mp_wifi_timer); -MP_REGISTER_ROOT_POINTER(struct _mp_obj_list_t *mp_wifi_sockpoll_list); - #endif // MICROPY_PY_NETWORK_NINAW10 diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c index 622e29ba68..4014a71c1a 100644 --- a/extmod/network_ninaw10.c +++ b/extmod/network_ninaw10.c @@ -797,4 +797,8 @@ const mod_network_nic_type_t mod_network_nic_type_nina = { .ioctl = network_ninaw10_socket_ioctl, }; +MP_REGISTER_ROOT_POINTER(struct _machine_spi_obj_t *mp_wifi_spi); +MP_REGISTER_ROOT_POINTER(struct _machine_timer_obj_t *mp_wifi_timer); +MP_REGISTER_ROOT_POINTER(struct _mp_obj_list_t *mp_wifi_sockpoll_list); + #endif // #if MICROPY_PY_BLUETOOTH && MICROPY_PY_NETWORK_NINAW10 diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h index 14748a763d..d07c1015e7 100644 --- a/ports/rp2/mpconfigport.h +++ b/ports/rp2/mpconfigport.h @@ -176,7 +176,6 @@ extern const struct _mp_obj_type_t mp_network_cyw43_type; #ifndef MICROPY_PY_USOCKET_EXTENDED_STATE #define MICROPY_PY_USOCKET_EXTENDED_STATE (1) #endif -// It also requires an additional root pointer for the SPI object. extern const struct _mod_network_nic_type_t mod_network_nic_type_nina; #define MICROPY_HW_NIC_NINAW10 { MP_ROM_QSTR(MP_QSTR_WLAN), MP_ROM_PTR(&mod_network_nic_type_nina) }, #else