This is an automated email from the ASF dual-hosted git repository.
andk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
The following commit(s) were added to refs/heads/master by this push:
new 3af5b83c0 hw/mcu/nordic: Bump nrfx to v3.14.0
3af5b83c0 is described below
commit 3af5b83c07f7cc4ecfc4f6e2217b526e07a75d50
Author: Andrzej Kaczmarek <[email protected]>
AuthorDate: Wed Sep 24 11:01:59 2025 +0200
hw/mcu/nordic: Bump nrfx to v3.14.0
This bumps nrfx to v3.14.0.
---
hw/drivers/adc/adc_nrf52/src/adc_nrf52.c | 4 +--
hw/mcu/nordic/include/nrfx_glue.h | 53 ++++++++++++++++++++++++++------
hw/mcu/nordic/pkg.yml | 2 +-
3 files changed, 46 insertions(+), 13 deletions(-)
diff --git a/hw/drivers/adc/adc_nrf52/src/adc_nrf52.c
b/hw/drivers/adc/adc_nrf52/src/adc_nrf52.c
index e3712995c..5f701d262 100644
--- a/hw/drivers/adc/adc_nrf52/src/adc_nrf52.c
+++ b/hw/drivers/adc/adc_nrf52/src/adc_nrf52.c
@@ -476,7 +476,7 @@ nrf52_adc_sample(struct adc_dev *dev)
if ((used_chans == 1) &&
(g_drv_instance.oversample != NRF_SAADC_OVERSAMPLE_DISABLED)) {
- nrf_saadc_burst_set(NRF_SAADC, cnum_last, NRF_SAADC_BURST_ENABLED);
+ nrf_saadc_channel_burst_set(NRF_SAADC, cnum_last,
NRF_SAADC_BURST_ENABLED);
nrf_saadc_oversample_set(NRF_SAADC, g_drv_instance.oversample);
} else {
nrf_saadc_oversample_set(NRF_SAADC, NRF_SAADC_OVERSAMPLE_DISABLED);
@@ -539,7 +539,7 @@ nrf52_adc_read_channel(struct adc_dev *dev, uint8_t cnum,
int *result)
g_drv_instance.channels[cnum].pin_n);
if (g_drv_instance.oversample != NRF_SAADC_OVERSAMPLE_DISABLED) {
- nrf_saadc_burst_set(NRF_SAADC, cnum, NRF_SAADC_BURST_ENABLED);
+ nrf_saadc_channel_burst_set(NRF_SAADC, cnum, NRF_SAADC_BURST_ENABLED);
nrf_saadc_oversample_set(NRF_SAADC, g_drv_instance.oversample);
} else {
nrf_saadc_oversample_set(NRF_SAADC, NRF_SAADC_OVERSAMPLE_DISABLED);
diff --git a/hw/mcu/nordic/include/nrfx_glue.h
b/hw/mcu/nordic/include/nrfx_glue.h
index 6f42c2e1d..e63de6007 100644
--- a/hw/mcu/nordic/include/nrfx_glue.h
+++ b/hw/mcu/nordic/include/nrfx_glue.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017 - 2023, Nordic Semiconductor ASA
+ * Copyright (c) 2017 - 2025, Nordic Semiconductor ASA
* All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
@@ -76,7 +76,7 @@ extern "C" {
/**
* @brief Macro for setting the priority of a specific IRQ.
*
- * @param irq_number IRQ number.
+ * @param irq_number IRQ number.
* @param priority Priority to be set.
*/
#define NRFX_IRQ_PRIORITY_SET(irq_number, priority)
NVIC_SetPriority(irq_number, priority)
@@ -84,14 +84,14 @@ extern "C" {
/**
* @brief Macro for enabling a specific IRQ.
*
- * @param irq_number IRQ number.
+ * @param irq_number IRQ number.
*/
#define NRFX_IRQ_ENABLE(irq_number) NVIC_EnableIRQ(irq_number)
/**
* @brief Macro for checking if a specific IRQ is enabled.
*
- * @param irq_number IRQ number.
+ * @param irq_number IRQ number.
*
* @retval true If the IRQ is enabled.
* @retval false Otherwise.
@@ -101,21 +101,21 @@ extern "C" {
/**
* @brief Macro for disabling a specific IRQ.
*
- * @param irq_number IRQ number.
+ * @param irq_number IRQ number.
*/
#define NRFX_IRQ_DISABLE(irq_number) NVIC_DisableIRQ(irq_number)
/**
* @brief Macro for setting a specific IRQ as pending.
*
- * @param irq_number IRQ number.
+ * @param irq_number IRQ number.
*/
#define NRFX_IRQ_PENDING_SET(irq_number) NVIC_SetPendingIRQ(irq_number)
/**
* @brief Macro for clearing the pending status of a specific IRQ.
*
- * @param irq_number IRQ number.
+ * @param irq_number IRQ number.
*/
#define NRFX_IRQ_PENDING_CLEAR(irq_number) NVIC_ClearPendingIRQ(irq_number)
@@ -273,6 +273,39 @@ extern "C" {
//------------------------------------------------------------------------------
+/**
+ * @brief Macro for writing back cache lines associated with the specified
buffer.
+ *
+ * @note Macro should be empty if data cache is disabled or not present.
+ *
+ * @param[in] p_buffer Pointer to the buffer.
+ * @param[in] size Size of the buffer.
+ */
+#define NRFY_CACHE_WB(p_buffer, size) (void)size
+
+/**
+ * @brief Macro for invalidating cache lines associated with the specified
buffer.
+ *
+ * @note Macro should be empty if data cache is disabled or not present.
+ *
+ * @param[in] p_buffer Pointer to the buffer.
+ * @param[in] size Size of the buffer.
+ */
+#define NRFY_CACHE_INV(p_buffer, size) (void)size
+
+/**
+ * @brief Macro for writing back and invalidating cache lines associated with
+ * the specified buffer.
+ *
+ * @note Macro should be empty if data cache is disabled or not present.
+ *
+ * @param[in] p_buffer Pointer to the buffer.
+ * @param[in] size Size of the buffer.
+ */
+#define NRFY_CACHE_WBINV(p_buffer, size) (void)size
+
+//------------------------------------------------------------------------------
+
/** @brief Bitmask that defines DPPI channels that are reserved for use
outside of the nrfx library. */
#define NRFX_DPPI_CHANNELS_USED 0
@@ -280,10 +313,10 @@ extern "C" {
#define NRFX_DPPI_GROUPS_USED 0
/** @brief Bitmask that defines PPI channels that are reserved for use outside
of the nrfx library. */
-#define NRFX_PPI_CHANNELS_USED 0
+#define NRFX_PPI_CHANNELS_USED 0
/** @brief Bitmask that defines PPI groups that are reserved for use outside
of the nrfx library. */
-#define NRFX_PPI_GROUPS_USED 0
+#define NRFX_PPI_GROUPS_USED 0
/** @brief Bitmask that defines GPIOTE channels that are reserved for use
outside of the nrfx library. */
#define NRFX_GPIOTE_CHANNELS_USED 0
@@ -292,7 +325,7 @@ extern "C" {
#define NRFX_EGUS_USED 0
/** @brief Bitmask that defines TIMER instances that are reserved for use
outside of the nrfx library. */
-#define NRFX_TIMERS_USED 0
+#define NRFX_TIMERS_USED 0
/** @} */
diff --git a/hw/mcu/nordic/pkg.yml b/hw/mcu/nordic/pkg.yml
index c2ed1dd6d..038045ecf 100644
--- a/hw/mcu/nordic/pkg.yml
+++ b/hw/mcu/nordic/pkg.yml
@@ -58,7 +58,7 @@ pkg.deps:
repository.nordic-nrfx:
type: github
- vers: v3.8.0-commit
+ vers: v3.14.0-commit
branch: master
user: NordicSemiconductor
repo: nrfx
