Remove use of SDK/components/drivers_nrf/hal/*

cores/nRF5/SDK/components/drivers_nrf/hal/nrf_adc.c

-/* Copyright (c) 2014 Nordic Semiconductor. All Rights Reserved.
- *
- * The information contained herein is property of Nordic Semiconductor ASA.
- * Terms and conditions of usage are described in detail in NORDIC
- * SEMICONDUCTOR STANDARD SOFTWARE LICENSE AGREEMENT.
- *
- * Licensees are granted free, non-transferable use of the information. NO
- * WARRANTY of ANY KIND is provided. This heading must NOT be removed from
- * the file.
- *
- */
-
-/**
- * @file
- * @brief ADC HAL implementation
- */
-
-#include "nrf_adc.h"
-
-#ifndef NRF52
-
-/**
- * @brief Function for configuring ADC.
- *
- * This function powers on ADC and configures it. ADC is in DISABLE state after configuration,
- * so it should be enabled before using it.
- *
- * @param[in] config  Requested configuration.
- */
-void nrf_adc_configure(nrf_adc_config_t * config)
-{
-    uint32_t config_reg = 0;
-
-    config_reg |= ((uint32_t)config->resolution << ADC_CONFIG_RES_Pos) & ADC_CONFIG_RES_Msk;
-    config_reg |= ((uint32_t)config->scaling << ADC_CONFIG_INPSEL_Pos) & ADC_CONFIG_INPSEL_Msk;
-    config_reg |= ((uint32_t)config->reference << ADC_CONFIG_REFSEL_Pos) & ADC_CONFIG_REFSEL_Msk;
-
-    if (config->reference & ADC_CONFIG_EXTREFSEL_Msk)
-    {
-        config_reg |= config->reference & ADC_CONFIG_EXTREFSEL_Msk;
-    }
-
-    /* select input */
-    nrf_adc_input_select(NRF_ADC_CONFIG_INPUT_DISABLED);
-
-    /* set new configuration keeping selected input */
-    NRF_ADC->CONFIG = config_reg | (NRF_ADC->CONFIG & ADC_CONFIG_PSEL_Msk);
-}
-
-
-/**
- * @brief Blocking function for executing single ADC conversion.
- *
- * This function selects the desired input, starts a single conversion,
- * waits for it to finish, and returns the result.
- * ADC is left in STOP state, the given input is selected.
- * This function does not check if ADC is initialized and powered.
- *
- * @param[in] input Requested input to be selected.
- *
- * @return Conversion result
- */
-int32_t nrf_adc_convert_single(nrf_adc_config_input_t input)
-{
-    int32_t val;
-
-    nrf_adc_input_select(input);
-    nrf_adc_start();
-
-    while (!nrf_adc_conversion_finished())
-    {
-    }
-    nrf_adc_conversion_event_clean();
-    val = nrf_adc_result_get();
-    nrf_adc_stop();
-    return val;
-}
-#endif

cores/nRF5/SDK/components/drivers_nrf/hal/nrf_saadc.c

-/* Copyright (c) 2015 Nordic Semiconductor. All Rights Reserved.
- *
- * The information contained herein is property of Nordic Semiconductor ASA.
- * Terms and conditions of usage are described in detail in NORDIC
- * SEMICONDUCTOR STANDARD SOFTWARE LICENSE AGREEMENT.
- *
- * Licensees are granted free, non-transferable use of the information. NO
- * WARRANTY of ANY KIND is provided. This heading must NOT be removed from
- * the file.
- *
- */
-
-/**
- * @file
- * @brief SAADC HAL implementation
- */
-
-#ifdef NRF52
-
-#include "nrf_saadc.h"
-
-void nrf_saadc_channel_init(uint8_t channel, nrf_saadc_channel_config_t const * const config)
-{
-    NRF_SAADC->CH[channel].CONFIG =
-            ((config->resistor_p   << SAADC_CH_CONFIG_RESP_Pos)   & SAADC_CH_CONFIG_RESP_Msk)
-            | ((config->resistor_n << SAADC_CH_CONFIG_RESN_Pos)   & SAADC_CH_CONFIG_RESN_Msk)
-            | ((config->gain       << SAADC_CH_CONFIG_GAIN_Pos)   & SAADC_CH_CONFIG_GAIN_Msk)
-            | ((config->reference  << SAADC_CH_CONFIG_REFSEL_Pos) & SAADC_CH_CONFIG_REFSEL_Msk)
-            | ((config->acq_time   << SAADC_CH_CONFIG_TACQ_Pos)   & SAADC_CH_CONFIG_TACQ_Msk)
-            | ((config->mode       << SAADC_CH_CONFIG_MODE_Pos)   & SAADC_CH_CONFIG_MODE_Msk);
-    nrf_saadc_channel_input_set(channel, config->pin_p, config->pin_n);
-    return;
-}
-
-#endif

cores/nRF5/SDK/components/drivers_nrf/hal/nrf_temp.h

-/*
- * Copyright (c) Nordic Semiconductor ASA
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   1. Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- *
- *   2. Redistributions in binary form must reproduce the above copyright notice, this
- *   list of conditions and the following disclaimer in the documentation and/or
- *   other materials provided with the distribution.
- *
- *   3. Neither the name of Nordic Semiconductor ASA nor the names of other
- *   contributors to this software may be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef NRF_TEMP_H__
-#define NRF_TEMP_H__
-
-#include "nrf.h"
-
-/**
-* @defgroup nrf_temperature TEMP (temperature) abstraction
-* @{
-* @ingroup nrf_drivers temperature_example
-* @brief Temperature module init and read functions.
-*
-*/
-
-/**@cond NO_DOXYGEN */
-#define MASK_SIGN           (0x00000200UL)
-#define MASK_SIGN_EXTENSION (0xFFFFFC00UL)
-
-/**
- * @brief Function for preparing the temp module for temperature measurement.
- *
- * This function initializes the TEMP module and writes to the hidden configuration register.
- */
-static __INLINE void nrf_temp_init(void)
-{
-    /**@note Workaround for PAN_028 rev2.0A anomaly 31 - TEMP: Temperature offset value has to be manually loaded to the TEMP module */
-    *(uint32_t *) 0x4000C504 = 0;
-}
-
-/**
- * @brief Function for reading temperature measurement.
- *
- * The function reads the 10 bit 2's complement value and transforms it to a 32 bit 2's complement value.
- */
-static __INLINE int32_t nrf_temp_read(void)
-{
-    /**@note Workaround for PAN_028 rev2.0A anomaly 28 - TEMP: Negative measured values are not represented correctly */
-    return ((NRF_TEMP->TEMP & MASK_SIGN) != 0) ? (NRF_TEMP->TEMP | MASK_SIGN_EXTENSION) : (NRF_TEMP->TEMP);
-}
-/**@endcond */
-
-/** @} */
-
-#endif

cores/nRF5/Uart.h

@@ -19,8 +19,9 @@
 
 #pragma once
 
+#include <nrf.h>
+
 #include "HardwareSerial.h"
-#include "nrf_uart.h"
 #include "RingBuffer.h"
 
 #include <cstddef>

cores/nRF5/delay.c

@@ -16,7 +16,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "nrf_rtc.h"
+#include "nrf.h"
 
 #include "delay.h"
 #include "Arduino.h"
@@ -29,16 +29,16 @@ static volatile uint32_t overflows = 0;
 
 uint32_t millis( void )
 {
-  uint64_t ticks = (uint64_t)((uint64_t)overflows << (uint64_t)32) | (uint64_t)nrf_rtc_counter_get(NRF_RTC1);
+  uint64_t ticks = (uint64_t)((uint64_t)overflows << (uint64_t)32) | (uint64_t)(NRF_RTC1->COUNTER);
 
-  return (ticks * 1000) / RTC_INPUT_FREQ;
+  return (ticks * 1000) / 32768;
 }
 
 uint32_t micros( void )
 {
-  uint64_t ticks = (uint64_t)((uint64_t)overflows << (uint64_t)32) | (uint64_t)nrf_rtc_counter_get(NRF_RTC1);
+  uint64_t ticks = (uint64_t)((uint64_t)overflows << (uint64_t)32) | (uint64_t)(NRF_RTC1->COUNTER);
 
-  return (ticks * 1000000) / RTC_INPUT_FREQ;
+  return (ticks * 1000000) / 32768;
 }
 
 void delay( uint32_t ms )
@@ -58,7 +58,12 @@ void delay( uint32_t ms )
 
 void RTC1_IRQHandler(void)
 {
-  nrf_rtc_event_clear(NRF_RTC1, NRF_RTC_EVENT_OVERFLOW);
+  NRF_RTC1->EVENTS_OVRFLW = 0;
+
+#if __CORTEX_M == 0x04
+    volatile uint32_t dummy = NRF_RTC1->EVENTS_OVRFLW;
+    (void)dummy;
+#endif
 
   overflows = (overflows + 1) & 0xff;
 }

cores/nRF5/nrf_assert.h

-#ifndef NRF_ASSERT_H_
-#define NRF_ASSERT_H_
-
-#define ASSERT(expr)
-
-#endif

cores/nRF5/nrf_drv_config.h

-#ifndef NRF_DRV_CONFIG_H
-#define NRF_DRV_CONFIG_H
-
-#endif

cores/nRF5/pulse.c

@@ -16,7 +16,7 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#include "nrf_gpio.h"
+#include "nrf.h"
 
 #include <Arduino.h>
 

libraries/Wire/Wire.h

@@ -21,13 +21,7 @@
 #ifndef TwoWire_h
 #define TwoWire_h
 
-#ifdef NRF52
-#include "nrf_twim.h"
-#include "nrf_twis.h"
-#else
 #include "nrf.h"
-#include "nrf_twi.h"
-#endif
 
 #include "Stream.h"
 #include "variant.h"

platform.txt

@@ -53,7 +53,7 @@ build.extra_flags=
 
 nrf.sdk.path={runtime.platform.path}/cores/nRF5/SDK
 
-compiler.nrf.flags=-DNRF5 "-I{nrf.sdk.path}/components/toolchain/" "-I{nrf.sdk.path}/components/toolchain/CMSIS/Include" "-I{nrf.sdk.path}/components/toolchain/gcc/" "-I{nrf.sdk.path}/components/drivers_nrf/hal/" "-I{nrf.sdk.path}/components/device/" "-I{nrf.sdk.path}/components/softdevice/{softdevice}/headers/"
+compiler.nrf.flags=-DNRF5 "-I{nrf.sdk.path}/components/toolchain/" "-I{nrf.sdk.path}/components/toolchain/CMSIS/Include" "-I{nrf.sdk.path}/components/toolchain/gcc/" "-I{nrf.sdk.path}/components/device/" "-I{nrf.sdk.path}/components/softdevice/{softdevice}/headers/"
 
 # These can be overridden in platform.local.txt
 compiler.c.extra_flags={compiler.nrf.flags}