You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by je...@apache.org on 2023/05/08 11:19:50 UTC
[mynewt-core] 02/02: mcu/nrf5x: Fix nrfx include references
This is an automated email from the ASF dual-hosted git repository.
jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit 25f61662dbd8c97eda2c6357f6f7ec86c8788f34
Author: Jerzy Kasenberg <je...@codecoup.pl>
AuthorDate: Thu Apr 27 10:02:59 2023 +0200
mcu/nrf5x: Fix nrfx include references
In several places (i2s/qspi) inclusion from nrfx
were using nrfx prefix which was fine but redundant
because SDK package added everything to include path.
Now nrfx is in separate repository and nrfx prefix path
does not apply enymore.
This fixes all the places that had include path starting from:
nrfx/
---
hw/drivers/i2s/i2s_nrf52/include/i2s_nrf52/i2s_nrf52.h | 4 ++--
hw/drivers/i2s/i2s_nrf52/src/i2s_nrf52.c | 2 +-
hw/drivers/i2s/i2s_nrfx/include/i2s_nrfx/i2s_nrfx.h | 4 ++--
hw/drivers/i2s/i2s_nrfx/src/i2s_nrfx.c | 2 +-
hw/mcu/nordic/nrf52xxx/src/hal_qspi.c | 2 +-
hw/mcu/nordic/nrf5340/src/hal_qspi.c | 2 +-
hw/mcu/nordic/nrf91xx/src/hal_qspi.c | 2 +-
hw/usb/tinyusb/nrf53/src/nrf53.c | 2 +-
hw/usb/tinyusb/nrf5x/src/nrf5x.c | 2 +-
9 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/hw/drivers/i2s/i2s_nrf52/include/i2s_nrf52/i2s_nrf52.h b/hw/drivers/i2s/i2s_nrf52/include/i2s_nrf52/i2s_nrf52.h
index a8056a5af..74ac264d9 100644
--- a/hw/drivers/i2s/i2s_nrf52/include/i2s_nrf52/i2s_nrf52.h
+++ b/hw/drivers/i2s/i2s_nrf52/include/i2s_nrf52/i2s_nrf52.h
@@ -21,8 +21,8 @@
#define _I2S_NRF52_H
#include <stdint.h>
-#include <nrfx/nrfx.h>
-#include <nrfx/drivers/include/nrfx_i2s.h>
+#include <nrfx.h>
+#include <drivers/include/nrfx_i2s.h>
#ifdef __cplusplus
extern "C" {
diff --git a/hw/drivers/i2s/i2s_nrf52/src/i2s_nrf52.c b/hw/drivers/i2s/i2s_nrf52/src/i2s_nrf52.c
index df3a49824..9eba38fc7 100644
--- a/hw/drivers/i2s/i2s_nrf52/src/i2s_nrf52.c
+++ b/hw/drivers/i2s/i2s_nrf52/src/i2s_nrf52.c
@@ -22,7 +22,7 @@
#include <i2s/i2s.h>
#include <i2s/i2s_driver.h>
#include <i2s_nrf52/i2s_nrf52.h>
-#include <nrfx/drivers/include/nrfx_i2s.h>
+#include <drivers/include/nrfx_i2s.h>
struct nrf52_i2s {
nrfx_i2s_config_t nrfx_i2s_cfg;
diff --git a/hw/drivers/i2s/i2s_nrfx/include/i2s_nrfx/i2s_nrfx.h b/hw/drivers/i2s/i2s_nrfx/include/i2s_nrfx/i2s_nrfx.h
index cba26e3db..c37d2b155 100644
--- a/hw/drivers/i2s/i2s_nrfx/include/i2s_nrfx/i2s_nrfx.h
+++ b/hw/drivers/i2s/i2s_nrfx/include/i2s_nrfx/i2s_nrfx.h
@@ -21,8 +21,8 @@
#define _I2S_NRFX_H
#include <stdint.h>
-#include <nrfx/nrfx.h>
-#include <nrfx/drivers/include/nrfx_i2s.h>
+#include <nrfx.h>
+#include <drivers/include/nrfx_i2s.h>
#ifdef __cplusplus
extern "C" {
diff --git a/hw/drivers/i2s/i2s_nrfx/src/i2s_nrfx.c b/hw/drivers/i2s/i2s_nrfx/src/i2s_nrfx.c
index 1243772cb..734c01ad9 100644
--- a/hw/drivers/i2s/i2s_nrfx/src/i2s_nrfx.c
+++ b/hw/drivers/i2s/i2s_nrfx/src/i2s_nrfx.c
@@ -22,7 +22,7 @@
#include <i2s/i2s.h>
#include <i2s/i2s_driver.h>
#include <i2s_nrfx/i2s_nrfx.h>
-#include <nrfx/drivers/include/nrfx_i2s.h>
+#include <drivers/include/nrfx_i2s.h>
#include <nrfx_clock.h>
struct i2s_nrfx {
diff --git a/hw/mcu/nordic/nrf52xxx/src/hal_qspi.c b/hw/mcu/nordic/nrf52xxx/src/hal_qspi.c
index 88769e83f..f61d65b00 100644
--- a/hw/mcu/nordic/nrf52xxx/src/hal_qspi.c
+++ b/hw/mcu/nordic/nrf52xxx/src/hal_qspi.c
@@ -26,7 +26,7 @@
#include <hal/hal_flash_int.h>
#include "mcu/nrf52_hal.h"
#include "nrf.h"
-#include <nrfx/hal/nrf_qspi.h>
+#include <hal/nrf_qspi.h>
#if MYNEWT_VAL(QSPI_FLASH_SECTOR_SIZE) < 1
#error QSPI_FLASH_SECTOR_SIZE must be set to the correct value in bsp syscfg.yml
diff --git a/hw/mcu/nordic/nrf5340/src/hal_qspi.c b/hw/mcu/nordic/nrf5340/src/hal_qspi.c
index b43fcd158..f5771e2ad 100644
--- a/hw/mcu/nordic/nrf5340/src/hal_qspi.c
+++ b/hw/mcu/nordic/nrf5340/src/hal_qspi.c
@@ -25,7 +25,7 @@
#include <hal/hal_flash_int.h>
#include "mcu/nrf5340_hal.h"
#include "nrf.h"
-#include <nrfx/hal/nrf_qspi.h>
+#include <hal/nrf_qspi.h>
#if MYNEWT_VAL(QSPI_FLASH_SECTOR_SIZE) < 1
#error QSPI_FLASH_SECTOR_SIZE must be set to the correct value in bsp syscfg.yml
diff --git a/hw/mcu/nordic/nrf91xx/src/hal_qspi.c b/hw/mcu/nordic/nrf91xx/src/hal_qspi.c
index 0b1e17d1c..eaaf61afa 100644
--- a/hw/mcu/nordic/nrf91xx/src/hal_qspi.c
+++ b/hw/mcu/nordic/nrf91xx/src/hal_qspi.c
@@ -26,7 +26,7 @@
#include <hal/hal_flash_int.h>
#include "mcu/nrf91_hal.h"
#include "nrf.h"
-#include <nrfx/hal/nrf_qspi.h>
+#include <hal/nrf_qspi.h>
#if MYNEWT_VAL(QSPI_FLASH_SECTOR_SIZE) < 1
#error QSPI_FLASH_SECTOR_SIZE must be set to the correct value in bsp syscfg.yml
diff --git a/hw/usb/tinyusb/nrf53/src/nrf53.c b/hw/usb/tinyusb/nrf53/src/nrf53.c
index a439b06e6..f574d30ec 100644
--- a/hw/usb/tinyusb/nrf53/src/nrf53.c
+++ b/hw/usb/tinyusb/nrf53/src/nrf53.c
@@ -20,7 +20,7 @@
#include <os/mynewt.h>
#include <device/usbd.h>
-#include <nrfx/hal/nrf_usbreg.h>
+#include <hal/nrf_usbreg.h>
/* same value as NRFX_POWER_USB_EVT_* in nrfx_power */
enum {
diff --git a/hw/usb/tinyusb/nrf5x/src/nrf5x.c b/hw/usb/tinyusb/nrf5x/src/nrf5x.c
index 03d054571..8096d48a4 100755
--- a/hw/usb/tinyusb/nrf5x/src/nrf5x.c
+++ b/hw/usb/tinyusb/nrf5x/src/nrf5x.c
@@ -22,7 +22,7 @@
#include <device/usbd.h>
#include <tusb.h>
-#include <nrfx/hal/nrf_power.h>
+#include <hal/nrf_power.h>
/* same value as NRFX_POWER_USB_EVT_* in nrfx_power */
enum {