Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drivers/ieee802154/Kconfig.mcxw
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ menuconfig IEEE802154_MCXW
bool "NXP MCXW series IEEE 802.15.4 Driver"
default y
depends on DT_HAS_NXP_MCXW_IEEE802154_ENABLED
depends on COUNTER
select COUNTER

if IEEE802154_MCXW

Expand Down
8 changes: 2 additions & 6 deletions drivers/ieee802154/ieee802154_mcxw.c
Original file line number Diff line number Diff line change
Expand Up @@ -862,7 +862,7 @@ static int mcxw_cca(const struct device *dev)

k_sem_take(&mcxw_radio->cca_wait, K_FOREVER);

return (mcxw_radio->tx_status == OT_ERROR_CHANNEL_ACCESS_FAILURE) ? -EBUSY : 0;
return (mcxw_radio->tx_status > 0) ? -EBUSY : 0;
}

static int mcxw_set_channel(const struct device *dev, uint16_t channel)
Expand Down Expand Up @@ -1195,9 +1195,6 @@ static int mcxw_configure(const struct device *dev, enum ieee802154_config_type
case IEEE802154_CONFIG_EVENT_HANDLER:
break;

case IEEE802154_OPENTHREAD_CONFIG_MAX_EXTRA_CCA_ATTEMPTS:
break;

default:
return -EINVAL;
}
Expand Down Expand Up @@ -1229,8 +1226,7 @@ static enum ieee802154_hw_caps mcxw_get_capabilities(const struct device *dev)
IEEE802154_HW_TX_RX_ACK | IEEE802154_HW_RX_TX_ACK | IEEE802154_HW_ENERGY_SCAN |
IEEE802154_HW_TXTIME | IEEE802154_HW_RXTIME | IEEE802154_HW_SLEEP_TO_TX |
IEEE802154_RX_ON_WHEN_IDLE | IEEE802154_HW_TX_SEC |
IEEE802154_OPENTHREAD_HW_MULTIPLE_CCA | IEEE802154_HW_SELECTIVE_TXCHANNEL |
IEEE802154_OPENTHREAD_HW_CST;
IEEE802154_HW_SELECTIVE_TXCHANNEL;
return caps;
}

Expand Down
11 changes: 5 additions & 6 deletions modules/hal_nxp/mcux/mcux-sdk-ng/components/components.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,11 @@ if(CONFIG_NXP_RF_IMU)
endif()
endif()

if(CONFIG_SOC_SERIES_MCXW)
if(CONFIG_NET_L2_IEEE802154 OR CONFIG_NET_L2_OPENTHREAD)
set(CONFIG_MCUX_COMPONENT_component.lists ON)
set(CONFIG_USE_component_osa_zephyr ON)
zephyr_compile_definitions(OSA_USED=1U)
endif()
if(CONFIG_SOC_SERIES_MCXW AND CONFIG_IEEE802154)
set(CONFIG_MCUX_COMPONENT_driver.spc ON)
set(CONFIG_MCUX_COMPONENT_component.lists ON)
set(CONFIG_USE_component_osa_zephyr ON)
zephyr_compile_definitions(OSA_USED=1U)
endif()

if(CONFIG_USE_component_osa_zephyr)
Expand Down
4 changes: 2 additions & 2 deletions soc/nxp/mcx/mcxw/Kconfig.defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ config HCI_NXP_RX_THREAD

endif # BT

if NET_L2_IEEE802154 || NET_L2_OPENTHREAD
if IEEE802154

# Include intercore messaging component
config NXP_RF_IMU
default y

endif # NET_L2_IEEE802154 || NET_L2_OPENTHREAD
endif # IEEE802154


endif # SOC_SERIES_MCXW
2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ manifest:
groups:
- hal
- name: hal_nxp
revision: fa2b503de28020a5c679920a4c0263920d161b2f
revision: 6a316c1bf7b381845ae8af64208906f6ec332eab
path: modules/hal/nxp
groups:
- hal
Expand Down