[mynewt-core] 01/02: hw/mcu/nordic: Fix includes for nRF91

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

janc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git

commit e89ef7d5b1cacfbb0ef9c6ca792b1b7267f44c5e
Author: Szymon Janc <sz...@codecoup.pl>
AuthorDate: Mon Sep 7 09:15:32 2020 +0200

    hw/mcu/nordic: Fix includes for nRF91
    
    nrfx_config_nrf9160.h should not be included directly.
---
 hw/mcu/nordic/nrf91xx/src/hal_flash.c    | 2 +-
 hw/mcu/nordic/nrf91xx/src/hal_gpio.c     | 2 +-
 hw/mcu/nordic/nrf91xx/src/hal_i2c.c      | 2 +-
 hw/mcu/nordic/nrf91xx/src/hal_nvreg.c    | 2 +-
 hw/mcu/nordic/nrf91xx/src/hal_os_tick.c  | 2 +-
 hw/mcu/nordic/nrf91xx/src/hal_spi.c      | 2 +-
 hw/mcu/nordic/nrf91xx/src/hal_system.c   | 2 +-
 hw/mcu/nordic/nrf91xx/src/hal_timer.c    | 2 +-
 hw/mcu/nordic/nrf91xx/src/hal_uart.c     | 2 +-
 hw/mcu/nordic/nrf91xx/src/hal_watchdog.c | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/hw/mcu/nordic/nrf91xx/src/hal_flash.c b/hw/mcu/nordic/nrf91xx/src/hal_flash.c
index e1bf23b..00cbda6 100644
--- a/hw/mcu/nordic/nrf91xx/src/hal_flash.c
+++ b/hw/mcu/nordic/nrf91xx/src/hal_flash.c
@@ -22,7 +22,7 @@
 #include "nrf.h"
 #include "mcu/nrf91_hal.h"
 #include <hal/hal_flash_int.h>
-#include "nrfx_config_nrf9160.h"
+#include "nrfx_config.h"
 #include "nrf_nvmc.h"
 
 #define NRF91K_FLASH_SECTOR_SZ	4096
diff --git a/hw/mcu/nordic/nrf91xx/src/hal_gpio.c b/hw/mcu/nordic/nrf91xx/src/hal_gpio.c
index 93a389f..e1e1674 100644
--- a/hw/mcu/nordic/nrf91xx/src/hal_gpio.c
+++ b/hw/mcu/nordic/nrf91xx/src/hal_gpio.c
@@ -24,7 +24,7 @@
 #include "mcu/cmsis_nvic.h"
 #include "nrf.h"
 #include "mcu/nrf91_hal.h"
-#include "nrfx_config_nrf9160.h"
+#include "nrfx_config.h"
 
 /* XXX:
  * 1) The code probably does not handle "re-purposing" gpio very well.
diff --git a/hw/mcu/nordic/nrf91xx/src/hal_i2c.c b/hw/mcu/nordic/nrf91xx/src/hal_i2c.c
index b9933b2..d59ec0c 100644
--- a/hw/mcu/nordic/nrf91xx/src/hal_i2c.c
+++ b/hw/mcu/nordic/nrf91xx/src/hal_i2c.c
@@ -26,7 +26,7 @@
 #include <hal/hal_gpio.h>
 #include <mcu/nrf91_hal.h>
 #include "nrf_twim.h"
-#include "nrfx_config_nrf9160.h"
+#include "nrfx_config.h"
 
 #include <nrf.h>
 
diff --git a/hw/mcu/nordic/nrf91xx/src/hal_nvreg.c b/hw/mcu/nordic/nrf91xx/src/hal_nvreg.c
index d5b8c0d..2a59592 100644
--- a/hw/mcu/nordic/nrf91xx/src/hal_nvreg.c
+++ b/hw/mcu/nordic/nrf91xx/src/hal_nvreg.c
@@ -20,7 +20,7 @@
 #include <mcu/cortex_m33.h>
 #include "hal/hal_nvreg.h"
 #include "nrf.h"
-#include "nrfx_config_nrf9160.h"
+#include "nrfx_config.h"
 
 /* There are two GPREGRET registers on the NRF91 */
 #define HAL_NVREG_MAX (2)
diff --git a/hw/mcu/nordic/nrf91xx/src/hal_os_tick.c b/hw/mcu/nordic/nrf91xx/src/hal_os_tick.c
index 36e61c5..b7ba3d1 100644
--- a/hw/mcu/nordic/nrf91xx/src/hal_os_tick.c
+++ b/hw/mcu/nordic/nrf91xx/src/hal_os_tick.c
@@ -22,7 +22,7 @@
 #include "hal/hal_os_tick.h"
 #include "nrf.h"
 #include "mcu/cmsis_nvic.h"
-#include "nrfx_config_nrf9160.h"
+#include "nrfx_config.h"
 
 /* The OS scheduler requires a low-frequency timer. */
 #if MYNEWT_VAL(OS_SCHEDULING) && !MYNEWT_VAL(MCU_LFCLK_SOURCE)
diff --git a/hw/mcu/nordic/nrf91xx/src/hal_spi.c b/hw/mcu/nordic/nrf91xx/src/hal_spi.c
index f7ec623..eafe2ae 100644
--- a/hw/mcu/nordic/nrf91xx/src/hal_spi.c
+++ b/hw/mcu/nordic/nrf91xx/src/hal_spi.c
@@ -25,7 +25,7 @@
 #include <hal/hal_spi.h>
 #include "mcu/nrf91_hal.h"
 #include "nrf.h"
-#include "nrfx_config_nrf9160.h"
+#include "nrfx_config.h"
 
 #ifndef min
 #define min(a, b) ((a) < (b) ? (a) : (b))
diff --git a/hw/mcu/nordic/nrf91xx/src/hal_system.c b/hw/mcu/nordic/nrf91xx/src/hal_system.c
index b5254d7..66e24e8 100644
--- a/hw/mcu/nordic/nrf91xx/src/hal_system.c
+++ b/hw/mcu/nordic/nrf91xx/src/hal_system.c
@@ -22,7 +22,7 @@
 #include "hal/hal_system.h"
 #include "hal/hal_debug.h"
 #include "nrf.h"
-#include "nrfx_config_nrf9160.h"
+#include "nrfx_config.h"
 
 /**
  * Function called at startup. Called after BSS and .data initialized but
diff --git a/hw/mcu/nordic/nrf91xx/src/hal_timer.c b/hw/mcu/nordic/nrf91xx/src/hal_timer.c
index 9b71502..61f87a1 100644
--- a/hw/mcu/nordic/nrf91xx/src/hal_timer.c
+++ b/hw/mcu/nordic/nrf91xx/src/hal_timer.c
@@ -27,7 +27,7 @@
 #include "hal/nrf_clock.h"
 #include "nrf.h"
 #include "mcu/nrf91_hal.h"
-#include "nrfx_config_nrf9160.h"
+#include "nrfx_config.h"
 
 /* IRQ prototype */
 typedef void (*hal_timer_irq_handler_t)(void);
diff --git a/hw/mcu/nordic/nrf91xx/src/hal_uart.c b/hw/mcu/nordic/nrf91xx/src/hal_uart.c
index cec819e..d5ec62a 100644
--- a/hw/mcu/nordic/nrf91xx/src/hal_uart.c
+++ b/hw/mcu/nordic/nrf91xx/src/hal_uart.c
@@ -26,7 +26,7 @@
 
 #include "nrf.h"
 #include "mcu/nrf91_hal.h"
-#include "nrfx_config_nrf9160.h"
+#include "nrfx_config.h"
 
 
 #define UARTE_INT_ENDTX     UARTE_INTEN_ENDTX_Msk
diff --git a/hw/mcu/nordic/nrf91xx/src/hal_watchdog.c b/hw/mcu/nordic/nrf91xx/src/hal_watchdog.c
index 06bbd30..ff0a745 100644
--- a/hw/mcu/nordic/nrf91xx/src/hal_watchdog.c
+++ b/hw/mcu/nordic/nrf91xx/src/hal_watchdog.c
@@ -22,7 +22,7 @@
 #include "hal/hal_watchdog.h"
 #include "mcu/cmsis_nvic.h"
 #include "nrf.h"
-#include "nrfx_config_nrf9160.h"
+#include "nrfx_config.h"
 
 static void
 nrf91_hal_wdt_default_handler(void)