Merge pull request #7172 from mprse/NRF5x_updates

Unify RTC, lp ticker, and us ticker for NRF51 and NRF52 series

Author: Cruz Monrreal

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/flash_api.c

@@ -72,7 +72,6 @@ int32_t flash_init(flash_t *obj)
 
     if (first_init) {
         first_init = false;
-        lp_ticker_init();
     }
 
     return 0;

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/i2c_api.c

@@ -39,7 +39,7 @@
 
 #include "i2c_api.h"
 
-#if DEVICE_I2C
+#if (defined(DEVICE_I2C) && defined(DEVICE_LPTICKER))
 
 #include "mbed_assert.h"
 #include "mbed_error.h"

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF51/trng_api.c

@@ -73,7 +73,6 @@ void trng_init(trng_t *obj)
 
     if (first_init) {
         first_init = false;
-        lp_ticker_init();
     }
 }
 

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/common_rtc.h

@@ -36,7 +36,7 @@
  *
  */
 
-#if DEVICE_FLASH
+#if (defined(DEVICE_FLASH) && defined(DEVICE_LPTICKER))
 
 #include "hal/flash_api.h"
 #include "hal/lp_ticker_api.h"
@@ -84,8 +84,6 @@ int32_t flash_init(flash_t *obj)
         result = nrf_fstorage_init(&nordic_fstorage, &nrf_fstorage_nvmc, NULL);
 #endif
 
-        /* Initialize low power ticker for timeouts. */
-        lp_ticker_init();
     }
 
     /* Convert Nordic SDK error code to mbed HAL. */

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/flash_api.c

@@ -36,8 +36,7 @@
  *
  */
 
-#if DEVICE_I2C
-
+#if (defined(DEVICE_I2C) && defined(DEVICE_LPTICKER))
 /* I2C
  *
  * This HAL implementation uses the nrf_drv_twi.h API primarily but switches to TWI for the
@@ -131,8 +130,6 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl)
 
     if (first_init) {
         first_init = false;
-        /* Initialize low power ticker. Used for timeouts. */
-        lp_ticker_init();
 
         /* Register interrupt handlers in driver with the NVIC. */
         NVIC_SetVector(SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0_IRQn, (uint32_t) SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0_IRQHandler);

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/i2c_api.c

@@ -18,9 +18,9 @@
 #define US_TICKER_H
 
 /* TIMER0 is reserved for SoftDevice. We will use TIMER1 for us ticker
- * which counter size is 16 bits. */
+ * which counter size is 32 bits. */
 
-#define US_TICKER_COUNTER_BITS        16u
+#define US_TICKER_COUNTER_BITS        32u
 #define US_TICKER_FREQ                1000000
 
 #endif // US_TICKER_H

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/lp_ticker.c

@@ -173,13 +173,7 @@ void common_rtc_init(void)
     nrf_rtc_int_disable(COMMON_RTC_INSTANCE, LP_TICKER_INT_MASK);
 #endif
 
-    nrf_drv_common_irq_enable(nrf_drv_get_IRQn(COMMON_RTC_INSTANCE),
-#ifdef NRF51
-        APP_IRQ_PRIORITY_LOW
-#elif defined(NRF52) || defined(NRF52840_XXAA)
-        APP_IRQ_PRIORITY_LOWEST
-#endif
-        );
+    nrf_drv_common_irq_enable(nrf_drv_get_IRQn(COMMON_RTC_INSTANCE), APP_IRQ_PRIORITY_HIGH);
 
     nrf_rtc_task_trigger(COMMON_RTC_INSTANCE, NRF_RTC_TASK_START);
 
@@ -194,6 +188,9 @@ void common_rtc_set_interrupt(uint32_t ticks_count, uint32_t cc_channel,
 
     core_util_critical_section_enter();
 
+    /* Wrap ticks_count before comparisons. */
+    ticks_count = RTC_WRAP(ticks_count);
+
     /* COMPARE occurs when a CC register is N and the COUNTER value transitions from N-1 to N.
      * If the COUNTER is N, writing N+2 to a CC register is guaranteed to trigger a
      * COMPARE event at N+2.
@@ -202,10 +199,10 @@ void common_rtc_set_interrupt(uint32_t ticks_count, uint32_t cc_channel,
 
     if (now == ticks_count ||
         RTC_WRAP(now + 1) == ticks_count) {
-        ticks_count += 2;
+        ticks_count = RTC_WRAP(ticks_count + 2);
     }
 
-    nrf_rtc_cc_set(COMMON_RTC_INSTANCE, cc_channel, RTC_WRAP(ticks_count));
+    nrf_rtc_cc_set(COMMON_RTC_INSTANCE, cc_channel, ticks_count);
 
     if (!nrf_rtc_int_is_enabled(COMMON_RTC_INSTANCE, int_mask)) {
         nrf_rtc_event_clear(COMMON_RTC_INSTANCE, LP_TICKER_EVENT);