nordic: Use hal/ in all inclusions of nrfx HAL header files

Header files of nrfx HALs are not supposed to be included directly
but only with their names prepended with the hal/ directory (so that
an inclusion of an nrfx HAL header clearly differs from an inclusion
of an nrfx driver header).

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
This commit is contained in:
Andrzej Głąbek 2019-09-19 13:25:18 +02:00 committed by Ioannis Glaropoulos
commit 57c6cfc9cd
12 changed files with 13 additions and 15 deletions

View file

@ -5,7 +5,7 @@
*/
#include <init.h>
#include <nrf_power.h>
#include <hal/nrf_power.h>
static int board_nrf52840_pca10059_init(struct device *dev)
{

View file

@ -11,9 +11,9 @@
#include <device.h>
#include <drivers/clock_control.h>
#include <sys/__assert.h>
#include <nrf_clock.h>
#include <hal/nrf_clock.h>
#if defined(CONFIG_USB) && defined(CONFIG_SOC_NRF52840)
#include <nrf_power.h>
#include <hal/nrf_power.h>
#include <drivers/clock_control/nrf_clock_control.h>
#endif

View file

@ -8,7 +8,7 @@
#include <drivers/entropy.h>
#include <sys/atomic.h>
#include <soc.h>
#include "nrf_rng.h"
#include <hal/nrf_rng.h>
/*
* The nRF5 RNG HW has several characteristics that need to be taken

View file

@ -9,7 +9,7 @@
#include <drivers/sensor.h>
#include <drivers/clock_control.h>
#include <logging/log.h>
#include <nrf_temp.h>
#include <hal/nrf_temp.h>
LOG_MODULE_REGISTER(temp_nrf5, CONFIG_SENSOR_LOG_LEVEL);

View file

@ -10,7 +10,7 @@
#include <drivers/clock_control/nrf_clock_control.h>
#include <drivers/timer/system_timer.h>
#include <sys_clock.h>
#include <nrf_rtc.h>
#include <hal/nrf_rtc.h>
#include <spinlock.h>
#define RTC NRF_RTC1

View file

@ -10,7 +10,7 @@
#if defined(CONFIG_USB) && defined(CONFIG_SOC_NRF52840)
#include <device.h>
#endif
#include <nrf_clock.h>
#include <hal/nrf_clock.h>
/* TODO: move all these to clock_control.h ? */

View file

@ -5,7 +5,7 @@
*/
#include <zephyr.h>
#include <power/power.h>
#include <nrf_power.h>
#include <hal/nrf_power.h>
#include <logging/log.h>
LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);

View file

@ -16,7 +16,7 @@
#include <kernel.h>
#include <init.h>
#include <nrfx.h>
#include <nrf_power.h>
#include <hal/nrf_power.h>
#include <soc/nrfx_coredep.h>
#include <logging/log.h>

View file

@ -5,7 +5,7 @@
*/
#include <zephyr.h>
#include <power/power.h>
#include <nrf_power.h>
#include <hal/nrf_power.h>
#include <logging/log.h>
LOG_MODULE_DECLARE(soc, CONFIG_SOC_LOG_LEVEL);

View file

@ -16,7 +16,7 @@
#include <init.h>
#include <cortex_m/exc.h>
#include <nrfx.h>
#include <nrf_power.h>
#include <hal/nrf_power.h>
#include <soc/nrfx_coredep.h>
#include <logging/log.h>
@ -39,8 +39,6 @@ extern void z_NmiInit(void);
#error "Unknown SoC."
#endif
#include <hal/nrf_power.h>
#define LOG_LEVEL CONFIG_SOC_LOG_LEVEL
LOG_MODULE_REGISTER(soc);

View file

@ -13,7 +13,7 @@
#define LOG_MODULE_NAME bt_ctlr_cntr
#include "common/log.h"
#include "hal/debug.h"
#include "nrf_rtc.h"
#include <nrfx/hal/nrf_rtc.h>
#ifndef NRF_RTC
#define NRF_RTC NRF_RTC0

View file

@ -17,7 +17,7 @@
#include "common/log.h"
#include "hal/debug.h"
#include "nrf_ecb.h"
#include <nrfx/hal/nrf_ecb.h>
struct ecb_param {
u8_t key[16];