renamed NRF51_* to NRF5_*

6 files changed, 118 insertions, 116 deletions

diff --git a/os/hal/ports/NRF5/LLD/hal_pal_lld.c b/os/hal/ports/NRF5/LLD/hal_pal_lld.c
index cb25ee4..21e4b0b 100644
--- a/os/hal/ports/NRF5/LLD/hal_pal_lld.c
+++ b/os/hal/ports/NRF5/LLD/hal_pal_lld.c
@@ -15,7 +15,7 @@
 */

 

 /**

- * @file    pal_lld.c

+ * @file    NRF5/LLD/hal_pal_lld.c

  * @brief   NRF5 PAL subsystem low level driver source.

  *

  * @addtogroup PAL

@@ -46,7 +46,7 @@
 void _pal_lld_setpadmode(ioportid_t port, uint8_t pad, iomode_t mode)

 {

   (void)port;

-  osalDbgAssert(pad <= 31, "pal_lld_setpadmode() - invalid pad");

+  osalDbgAssert(pad < PAL_IOPORTS_WIDTH, "pal_lld_setpadmode() - invalid pad");

 

   switch (mode) {

   case PAL_MODE_RESET:

diff --git a/os/hal/ports/NRF5/LLD/hal_pal_lld.h b/os/hal/ports/NRF5/LLD/hal_pal_lld.h
index 40a2c5e..9eb333d 100644
--- a/os/hal/ports/NRF5/LLD/hal_pal_lld.h
+++ b/os/hal/ports/NRF5/LLD/hal_pal_lld.h
@@ -15,7 +15,7 @@
 */

 

 /**

- * @file    pal_lld.h

+ * @file    NRF5/LLD/hal_pal_lld.h

  * @brief   NRF5 PAL subsystem low level driver header.

  *

  * @addtogroup PAL

@@ -132,6 +132,8 @@ typedef NRF_GPIO_Type *ioportid_t;
 #define IOPORT1         NRF_GPIO

 #elif NRF_SERIES == 52

 #define IOPORT1         NRF_P0

+#else

+#error "Unknown NRF_SERIES"

 #endif

 

 /*===========================================================================*/

diff --git a/os/hal/ports/NRF5/LLD/hal_serial_lld.c b/os/hal/ports/NRF5/LLD/hal_serial_lld.c
index e67b433..31e5ade 100644
--- a/os/hal/ports/NRF5/LLD/hal_serial_lld.c
+++ b/os/hal/ports/NRF5/LLD/hal_serial_lld.c
@@ -15,8 +15,8 @@
 */

 

 /**

- * @file    serial_lld.c

- * @brief   NRF51822 serial subsystem low level driver source.

+ * @file    NRF5/LLD/hal_serial_lld.c

+ * @brief   NRF5 serial subsystem low level driver source.

  *

  * @addtogroup SERIAL

  * @{

@@ -43,7 +43,7 @@
 /*===========================================================================*/

 

 /** @brief USART1 serial driver identifier.*/

-#if (NRF51_SERIAL_USE_UART0 == TRUE) || defined(__DOXYGEN__)

+#if (NRF5_SERIAL_USE_UART0 == TRUE) || defined(__DOXYGEN__)

 SerialDriver SD1;

 #endif

 

@@ -56,11 +56,11 @@ SerialDriver SD1;
  */

 static const SerialConfig default_config = {

   .speed   = 38400,

-  .tx_pad  = NRF51_SERIAL_PAD_DISCONNECTED,

-  .rx_pad  = NRF51_SERIAL_PAD_DISCONNECTED,

-#if (NRF51_SERIAL_USE_HWFLOWCTRL == TRUE)

-  .rts_pad = NRF51_SERIAL_PAD_DISCONNECTED,

-  .cts_pad = NRF51_SERIAL_PAD_DISCONNECTED,

+  .tx_pad  = NRF5_SERIAL_PAD_DISCONNECTED,

+  .rx_pad  = NRF5_SERIAL_PAD_DISCONNECTED,

+#if (NRF5_SERIAL_USE_HWFLOWCTRL == TRUE)

+  .rts_pad = NRF5_SERIAL_PAD_DISCONNECTED,

+  .cts_pad = NRF5_SERIAL_PAD_DISCONNECTED,

 #endif

 };

 

@@ -101,17 +101,17 @@ static void configure_uart(const SerialConfig *config)
   };

 

   /* Configure PINs mode */

-  if (config->tx_pad != NRF51_SERIAL_PAD_DISCONNECTED) {

+  if (config->tx_pad != NRF5_SERIAL_PAD_DISCONNECTED) {

     palSetPadMode(IOPORT1, config->tx_pad, PAL_MODE_OUTPUT_PUSHPULL);

   }

-  if (config->rx_pad != NRF51_SERIAL_PAD_DISCONNECTED) {

+  if (config->rx_pad != NRF5_SERIAL_PAD_DISCONNECTED) {

     palSetPadMode(IOPORT1, config->rx_pad, PAL_MODE_INPUT);

   }

-#if (NRF51_SERIAL_USE_HWFLOWCTRL == TRUE)

-  if (config->rts_pad != NRF51_SERIAL_PAD_DISCONNECTED) {

+#if (NRF5_SERIAL_USE_HWFLOWCTRL == TRUE)

+  if (config->rts_pad != NRF5_SERIAL_PAD_DISCONNECTED) {

     palSetPadMode(IOPORT1, config->rts_pad, PAL_MODE_OUTPUT_PUSHPULL);

   }

-  if (config->cts_pad != NRF51_SERIAL_PAD_DISCONNECTED) {

+  if (config->cts_pad != NRF5_SERIAL_PAD_DISCONNECTED) {

     palSetPadMode(IOPORT1, config->cts_pad, PAL_MODE_INPUT);

   }

 #endif

@@ -119,12 +119,12 @@ static void configure_uart(const SerialConfig *config)
   /* Select PINs used by UART */

   NRF_UART0->PSELTXD = config->tx_pad;

   NRF_UART0->PSELRXD = config->rx_pad;

-#if (NRF51_SERIAL_USE_HWFLOWCTRL == TRUE)

+#if (NRF5_SERIAL_USE_HWFLOWCTRL == TRUE)

   NRF_UART0->PSELRTS = config->rts_pad;

   NRF_UART0->PSELCTS = config->cts_pad;

 #else

-  NRF_UART0->PSELRTS = NRF51_SERIAL_PAD_DISCONNECTED;

-  NRF_UART0->PSELCTS = NRF51_SERIAL_PAD_DISCONNECTED;

+  NRF_UART0->PSELRTS = NRF5_SERIAL_PAD_DISCONNECTED;

+  NRF_UART0->PSELCTS = NRF5_SERIAL_PAD_DISCONNECTED;

 #endif

 

   /* Set baud rate */

@@ -134,7 +134,7 @@ static void configure_uart(const SerialConfig *config)
   NRF_UART0->CONFIG = (UART_CONFIG_PARITY_Excluded << UART_CONFIG_PARITY_Pos);

 

   /* Adjust flow control */

-#if (NRF51_SERIAL_USE_HWFLOWCTRL == TRUE)

+#if (NRF5_SERIAL_USE_HWFLOWCTRL == TRUE)

   if ((config->rts_pad < TOTAL_GPIO_PADS) ||

       (config->cts_pad < TOTAL_GPIO_PADS)) {

     NRF_UART0->CONFIG |=   UART_CONFIG_HWFC_Enabled << UART_CONFIG_HWFC_Pos;

@@ -152,7 +152,7 @@ static void configure_uart(const SerialConfig *config)
   NRF_UART0->EVENTS_TXDRDY = 0;

   (void)NRF_UART0->EVENTS_TXDRDY;

 

-  if (config->rx_pad != NRF51_SERIAL_PAD_DISCONNECTED) {

+  if (config->rx_pad != NRF5_SERIAL_PAD_DISCONNECTED) {

     while (NRF_UART0->EVENTS_RXDRDY != 0) {

       (void)NRF_UART0->RXD;

     }

@@ -163,14 +163,14 @@ static void configure_uart(const SerialConfig *config)
 /**

  * @brief   Driver output notification.

  */

-#if NRF51_SERIAL_USE_UART0 || defined(__DOXYGEN__)

+#if NRF5_SERIAL_USE_UART0 || defined(__DOXYGEN__)

 static void notify1(io_queue_t *qp)

 {

   SerialDriver *sdp = &SD1;

 

   (void)qp;

 

-  if (NRF_UART0->PSELTXD == NRF51_SERIAL_PAD_DISCONNECTED)

+  if (NRF_UART0->PSELTXD == NRF5_SERIAL_PAD_DISCONNECTED)

     return;

 

   if (!sdp->tx_busy) {

@@ -193,7 +193,7 @@ static void notify1(io_queue_t *qp)
 /* Driver interrupt handlers.                                                */

 /*===========================================================================*/

 

-#if NRF51_SERIAL_USE_UART0 || defined(__DOXYGEN__)

+#if NRF5_SERIAL_USE_UART0 || defined(__DOXYGEN__)

 OSAL_IRQ_HANDLER(Vector48) {

 

   OSAL_IRQ_PROLOGUE();

@@ -260,7 +260,7 @@ OSAL_IRQ_HANDLER(Vector48) {
  */

 void sd_lld_init(void) {

 

-#if NRF51_SERIAL_USE_UART0 == TRUE

+#if NRF5_SERIAL_USE_UART0 == TRUE

   sdObjectInit(&SD1, NULL, notify1);

 #endif

 }

@@ -286,21 +286,21 @@ void sd_lld_start(SerialDriver *sdp, const SerialConfig *config) {
 

   if (sdp->state == SD_STOP) {

 

-#if NRF51_SERIAL_USE_UART0 == TRUE

+#if NRF5_SERIAL_USE_UART0 == TRUE

     if (sdp == &SD1) {

       configure_uart(config);

 

       // Enable UART interrupt

       NRF_UART0->INTENCLR = (uint32_t)-1;

       NRF_UART0->INTENSET = UART_INTENSET_ERROR_Msk;

-      if (config->rx_pad != NRF51_SERIAL_PAD_DISCONNECTED)

+      if (config->rx_pad != NRF5_SERIAL_PAD_DISCONNECTED)

           NRF_UART0->INTENSET |= UART_INTENSET_RXDRDY_Msk;

-      if (config->tx_pad != NRF51_SERIAL_PAD_DISCONNECTED)

+      if (config->tx_pad != NRF5_SERIAL_PAD_DISCONNECTED)

           NRF_UART0->INTENSET |= UART_INTENSET_TXDRDY_Msk;

 

-      nvicEnableVector(UART0_IRQn, NRF51_SERIAL_UART0_PRIORITY);

+      nvicEnableVector(UART0_IRQn, NRF5_SERIAL_UART0_PRIORITY);

 

-      if (config->rx_pad != NRF51_SERIAL_PAD_DISCONNECTED)

+      if (config->rx_pad != NRF5_SERIAL_PAD_DISCONNECTED)

         NRF_UART0->TASKS_STARTRX = 1;

     }

 #endif

@@ -321,7 +321,7 @@ void sd_lld_stop(SerialDriver *sdp) {
 

   if (sdp->state == SD_READY) {

 

-#if NRF51_SERIAL_USE_UART0 == TRUE

+#if NRF5_SERIAL_USE_UART0 == TRUE

     if (&SD1 == sdp) {

       nvicDisableVector(UART0_IRQn);

       NRF_UART0->ENABLE = UART_ENABLE_ENABLE_Disabled;

diff --git a/os/hal/ports/NRF5/LLD/hal_serial_lld.h b/os/hal/ports/NRF5/LLD/hal_serial_lld.h
index 79955b1..741a40a 100644
--- a/os/hal/ports/NRF5/LLD/hal_serial_lld.h
+++ b/os/hal/ports/NRF5/LLD/hal_serial_lld.h
@@ -15,8 +15,8 @@
 */

 

 /**

- * @file    serial_lld.h

- * @brief   NRF51822 serial subsystem low level driver header.

+ * @file    NRF5/LLD/hal_serial_lld.h

+ * @brief   NRF5 serial subsystem low level driver header.

  *

  * @addtogroup SERIAL

  * @{

@@ -45,8 +45,8 @@
  *          is included.

  * @note    The default is @p FALSE.

  */

-#if !defined(NRF51_SERIAL_USE_HWFLOWCTRL) || defined(__DOXYGEN__)

-#define NRF51_SERIAL_USE_HWFLOWCTRL        FALSE

+#if !defined(NRF5_SERIAL_USE_HWFLOWCTRL) || defined(__DOXYGEN__)

+#define NRF5_SERIAL_USE_HWFLOWCTRL        FALSE

 #endif

 

 /**

@@ -54,20 +54,20 @@
  * @details If set to @p TRUE the support for SD1 is included.

  * @note    The default is @p FALSE.

  */

-#if !defined(NRF51_SERIAL_USE_UART0) || defined(__DOXYGEN__)

-#define NRF51_SERIAL_USE_UART0             FALSE

+#if !defined(NRF5_SERIAL_USE_UART0) || defined(__DOXYGEN__)

+#define NRF5_SERIAL_USE_UART0             FALSE

 #endif

 

 /**

  * @brief   UART0 interrupt priority level setting.

  */

-#if !defined(NRF51_SERIAL_UART0_PRIORITY) || defined(__DOXYGEN__)

-#define NRF51_SERIAL_UART0_PRIORITY        3

+#if !defined(NRF5_SERIAL_UART0_PRIORITY) || defined(__DOXYGEN__)

+#define NRF5_SERIAL_UART0_PRIORITY        3

 #endif

 

 /* Value indicating that no pad is connected to this UART register. */

-#define  NRF51_SERIAL_PAD_DISCONNECTED 0xFFFFFFFFU

-#define  NRF51_SERIAL_INVALID_BAUDRATE 0xFFFFFFFFU

+#define  NRF5_SERIAL_PAD_DISCONNECTED 0xFFFFFFFFU

+#define  NRF5_SERIAL_INVALID_BAUDRATE 0xFFFFFFFFU

 

 /** @} */

 

@@ -75,8 +75,8 @@
 /* Derived constants and error checks.                                       */

 /*===========================================================================*/

 

-#if NRF51_SERIAL_USE_UART0 &&					\

-    !OSAL_IRQ_IS_VALID_PRIORITY(NRF51_SERIAL_UART0_PRIORITY)

+#if NRF5_SERIAL_USE_UART0 &&					\

+    !OSAL_IRQ_IS_VALID_PRIORITY(NRF5_SERIAL_UART0_PRIORITY)

 #error "Invalid IRQ priority assigned to UART0"

 #endif

 

@@ -100,7 +100,7 @@ typedef struct {
   /* End of the mandatory fields.*/

   uint32_t                  tx_pad;

   uint32_t                  rx_pad;

-#if (NRF51_SERIAL_USE_HWFLOWCTRL == TRUE)

+#if (NRF5_SERIAL_USE_HWFLOWCTRL == TRUE)

   uint32_t                  rts_pad;

   uint32_t                  cts_pad;

 #endif

@@ -134,7 +134,7 @@ typedef struct {
 /* External declarations.                                                    */

 /*===========================================================================*/

 

-#if (NRF51_SERIAL_USE_UART0 == TRUE) && !defined(__DOXYGEN__)

+#if (NRF5_SERIAL_USE_UART0 == TRUE) && !defined(__DOXYGEN__)

 extern SerialDriver SD1;

 #endif

 

diff --git a/os/hal/ports/NRF5/LLD/hal_st_lld.c b/os/hal/ports/NRF5/LLD/hal_st_lld.c
index a2c1a8f..931f1a7 100644
--- a/os/hal/ports/NRF5/LLD/hal_st_lld.c
+++ b/os/hal/ports/NRF5/LLD/hal_st_lld.c
@@ -16,8 +16,8 @@
 */

 

 /**

- * @file    st_lld.c

- * @brief   NRF51822 ST subsystem low level driver source.

+ * @file    NRF5/LLD/hal_st_lld.c

+ * @brief   NRF5 ST subsystem low level driver source.

  *

  * @addtogroup ST

  * @{

@@ -52,11 +52,11 @@
 /*===========================================================================*/

 

 #if (OSAL_ST_MODE == OSAL_ST_MODE_PERIODIC) || defined(__DOXYGEN__)

-#if NRF51_ST_USE_RTC0 == TRUE

+#if NRF5_ST_USE_RTC0 == TRUE

 /**

  * @brief   System Timer vector (RTC0)

  * @details This interrupt is used for system tick in periodic mode

- *          if selected with NRF51_ST_USE_RTC0

+ *          if selected with NRF5_ST_USE_RTC0

  *

  * @isr

  */

@@ -75,11 +75,11 @@ OSAL_IRQ_HANDLER(Vector6C) {
 }

 #endif

 

-#if NRF51_ST_USE_RTC1 == TRUE

+#if NRF5_ST_USE_RTC1 == TRUE

 /**

  * @brief   System Timer vector (RTC1)

  * @details This interrupt is used for system tick in periodic mode

- *          if selected with NRF51_ST_USE_RTC1

+ *          if selected with NRF5_ST_USE_RTC1

  *

  * @isr

  */

@@ -98,11 +98,11 @@ OSAL_IRQ_HANDLER(Vector84) {
 }

 #endif

 

-#if NRF51_ST_USE_TIMER0 == TRUE

+#if NRF5_ST_USE_TIMER0 == TRUE

 /**

  * @brief   System Timer vector. (TIMER0)

  * @details This interrupt is used for system tick in periodic mode

- *          if selected with NRF51_ST_USE_TIMER0

+ *          if selected with NRF5_ST_USE_TIMER0

  *

  * @isr

  */

@@ -126,11 +126,11 @@ OSAL_IRQ_HANDLER(Vector60) {
 #endif /* OSAL_ST_MODE == OSAL_ST_MODE_PERIODIC */

 

 #if (OSAL_ST_MODE == OSAL_ST_MODE_FREERUNNING) || defined(__DOXYGEN__)

-#if NRF51_ST_USE_RTC0 == TRUE

+#if NRF5_ST_USE_RTC0 == TRUE

 /**

  * @brief   System Timer vector (RTC0)

  * @details This interrupt is used for freerunning mode (tick-less)

- *          if selected with NRF51_ST_USE_RTC0 

+ *          if selected with NRF5_ST_USE_RTC0 

  *

  * @isr

  */

@@ -159,11 +159,11 @@ OSAL_IRQ_HANDLER(Vector6C) {
 }

 #endif

 

-#if NRF51_ST_USE_RTC1 == TRUE

+#if NRF5_ST_USE_RTC1 == TRUE

 /**

  * @brief   System Timer vector (RTC1)

  * @details This interrupt is used for freerunning mode (tick-less)

- *          if selected with NRF51_ST_USE_RTC1

+ *          if selected with NRF5_ST_USE_RTC1

  *

  * @isr

  */

@@ -205,10 +205,10 @@ OSAL_IRQ_HANDLER(Vector84) {
 void st_lld_init(void) {

 #if OSAL_ST_MODE == OSAL_ST_MODE_FREERUNNING

 

-#if NRF51_ST_USE_RTC0 == TRUE

+#if NRF5_ST_USE_RTC0 == TRUE

   /* Using RTC with prescaler */

   NRF_RTC0->TASKS_STOP  = 1;

-  NRF_RTC0->PRESCALER   = (NRF51_LFCLK_FREQUENCY / OSAL_ST_FREQUENCY) - 1; 

+  NRF_RTC0->PRESCALER   = (NRF5_LFCLK_FREQUENCY / OSAL_ST_FREQUENCY) - 1; 

   NRF_RTC0->EVTENCLR    = RTC_EVTENSET_COMPARE0_Msk;

   NRF_RTC0->EVENTS_COMPARE[0] = 0;

   NRF_RTC0->INTENSET    = RTC_INTENSET_COMPARE0_Msk;

@@ -221,14 +221,14 @@ void st_lld_init(void) {
   NRF_RTC0->TASKS_CLEAR  = 1;

 

     /* Start timer */

-  nvicEnableVector(RTC0_IRQn, NRF51_ST_PRIORITY);

+  nvicEnableVector(RTC0_IRQn, NRF5_ST_PRIORITY);

   NRF_RTC0->TASKS_START = 1;

-#endif /* NRF51_ST_USE_RTC0 == TRUE */

+#endif /* NRF5_ST_USE_RTC0 == TRUE */

 

-#if NRF51_ST_USE_RTC1 == TRUE

+#if NRF5_ST_USE_RTC1 == TRUE

   /* Using RTC with prescaler */

   NRF_RTC1->TASKS_STOP  = 1;

-  NRF_RTC1->PRESCALER   = (NRF51_LFCLK_FREQUENCY / OSAL_ST_FREQUENCY) - 1; 

+  NRF_RTC1->PRESCALER   = (NRF5_LFCLK_FREQUENCY / OSAL_ST_FREQUENCY) - 1; 

   NRF_RTC1->EVTENCLR    = RTC_EVTENSET_COMPARE0_Msk;

   NRF_RTC1->EVENTS_COMPARE[0] = 0;

   NRF_RTC1->INTENSET    = RTC_INTENSET_COMPARE0_Msk;

@@ -241,37 +241,37 @@ void st_lld_init(void) {
   NRF_RTC1->TASKS_CLEAR  = 1;

 

   /* Start timer */

-  nvicEnableVector(RTC1_IRQn, NRF51_ST_PRIORITY);

+  nvicEnableVector(RTC1_IRQn, NRF5_ST_PRIORITY);

   NRF_RTC1->TASKS_START = 1;

-#endif /* NRF51_ST_USE_RTC1 == TRUE */

+#endif /* NRF5_ST_USE_RTC1 == TRUE */

 

 #endif /* OSAL_ST_MODE == OSAL_ST_MODE_FREERUNNING */

 

 #if OSAL_ST_MODE == OSAL_ST_MODE_PERIODIC

 

-#if NRF51_ST_USE_RTC0 == TRUE

+#if NRF5_ST_USE_RTC0 == TRUE

   /* Using RTC with prescaler */

   NRF_RTC0->TASKS_STOP  = 1;

-  NRF_RTC0->PRESCALER   = (NRF51_LFCLK_FREQUENCY / OSAL_ST_FREQUENCY) - 1; 

+  NRF_RTC0->PRESCALER   = (NRF5_LFCLK_FREQUENCY / OSAL_ST_FREQUENCY) - 1; 

   NRF_RTC0->INTENSET    = RTC_INTENSET_TICK_Msk;

 

   /* Start timer */

-  nvicEnableVector(RTC0_IRQn, NRF51_ST_PRIORITY);

+  nvicEnableVector(RTC0_IRQn, NRF5_ST_PRIORITY);

   NRF_RTC0->TASKS_START = 1;

-#endif /* NRF51_ST_USE_RTC0 == TRUE */

+#endif /* NRF5_ST_USE_RTC0 == TRUE */

 

-#if NRF51_ST_USE_RTC1 == TRUE

+#if NRF5_ST_USE_RTC1 == TRUE

   /* Using RTC with prescaler */

   NRF_RTC1->TASKS_STOP  = 1;

-  NRF_RTC1->PRESCALER   = (NRF51_LFCLK_FREQUENCY / OSAL_ST_FREQUENCY) - 1; 

+  NRF_RTC1->PRESCALER   = (NRF5_LFCLK_FREQUENCY / OSAL_ST_FREQUENCY) - 1; 

   NRF_RTC1->INTENSET    = RTC_INTENSET_TICK_Msk;

 

   /* Start timer */

-  nvicEnableVector(RTC1_IRQn, NRF51_ST_PRIORITY);

+  nvicEnableVector(RTC1_IRQn, NRF5_ST_PRIORITY);

   NRF_RTC1->TASKS_START = 1;

-#endif /* NRF51_ST_USE_RTC1 == TRUE */

+#endif /* NRF5_ST_USE_RTC1 == TRUE */

 

-#if NRF51_ST_USE_TIMER0 == TRUE

+#if NRF5_ST_USE_TIMER0 == TRUE

   NRF_TIMER0->TASKS_CLEAR = 1;

 

   /*

@@ -290,9 +290,9 @@ void st_lld_init(void) {
   NRF_TIMER0->INTENSET = TIMER_INTENSET_COMPARE0_Msk;

 

   /* Start timer */

-  nvicEnableVector(TIMER0_IRQn, NRF51_ST_PRIORITY);

+  nvicEnableVector(TIMER0_IRQn, NRF5_ST_PRIORITY);

   NRF_TIMER0->TASKS_START = 1;

-#endif /* NRF51_ST_USE_TIMER0 == TRUE */

+#endif /* NRF5_ST_USE_TIMER0 == TRUE */

 

 #endif /* OSAL_ST_MODE == OSAL_ST_MODE_PERIODIC */

 }

diff --git a/os/hal/ports/NRF5/LLD/hal_st_lld.h b/os/hal/ports/NRF5/LLD/hal_st_lld.h
index 33cc0fb..eb425f9 100644
--- a/os/hal/ports/NRF5/LLD/hal_st_lld.h
+++ b/os/hal/ports/NRF5/LLD/hal_st_lld.h
@@ -40,40 +40,40 @@
 /**

  * @brief   Use RTC0 to generates system ticks

  */

-#if !defined(NRF51_ST_USE_RTC0) || defined(__DOXYGEN__)

+#if !defined(NRF5_ST_USE_RTC0) || defined(__DOXYGEN__)

 #if !defined(SOFTDEVICE_PRESENT)

-#define NRF51_ST_USE_RTC0        TRUE

+#define NRF5_ST_USE_RTC0        TRUE

 #else

-#define NRF51_ST_USE_RTC0        FALSE

+#define NRF5_ST_USE_RTC0        FALSE

 #endif

 #endif

 

 /**

  * @brief   Use RTC1 to generates system ticks

  */

-#if !defined(NRF51_ST_USE_RTC1) || defined(__DOXYGEN__)

+#if !defined(NRF5_ST_USE_RTC1) || defined(__DOXYGEN__)

 #if !defined(SOFTDEVICE_PRESENT)

-#define NRF51_ST_USE_RTC1        FALSE

+#define NRF5_ST_USE_RTC1        FALSE

 #else

-#define NRF51_ST_USE_RTC1        TRUE

+#define NRF5_ST_USE_RTC1        TRUE

 #endif

 #endif

 

 /**

  * @brief   Use TIMER0 to generates system ticks

  */

-#if !defined(NRF51_ST_USE_TIMER0) || defined(__DOXYGEN__)

-#define NRF51_ST_USE_TIMER0      FALSE

+#if !defined(NRF5_ST_USE_TIMER0) || defined(__DOXYGEN__)

+#define NRF5_ST_USE_TIMER0      FALSE

 #endif

 

 /**

  * @brief   ST interrupt priority level setting.

  */

-#if !defined(NRF51_ST_PRIORITY) || defined(__DOXYGEN__)

+#if !defined(NRF5_ST_PRIORITY) || defined(__DOXYGEN__)

 #if !defined(SOFTDEVICE_PRESENT)

-#define NRF51_ST_PRIORITY        CORTEX_MAX_KERNEL_PRIORITY

+#define NRF5_ST_PRIORITY        CORTEX_MAX_KERNEL_PRIORITY

 #else

-#define NRF51_ST_PRIORITY        1

+#define NRF5_ST_PRIORITY        1

 #endif

 #endif

 

@@ -82,32 +82,32 @@
 /*===========================================================================*/

 

 #if OSAL_ST_MODE != OSAL_ST_MODE_NONE

-#if (NRF51_ST_USE_TIMER0 == TRUE) && (NRF51_GPT_USE_TIMER0 == TRUE)

+#if (NRF5_ST_USE_TIMER0 == TRUE) && (NRF5_GPT_USE_TIMER0 == TRUE)

 #error "TIMER0 already used by GPT driver"

 #endif

 

-#if (NRF51_ST_USE_RTC0   == FALSE) && \

-    (NRF51_ST_USE_RTC1   == FALSE) && \

-    (NRF51_ST_USE_TIMER0 == FALSE)

+#if (NRF5_ST_USE_RTC0   == FALSE) && \

+    (NRF5_ST_USE_RTC1   == FALSE) && \

+    (NRF5_ST_USE_TIMER0 == FALSE)

 #error "One clock source is needed, enable one (RTC0, RTC1, or TIMER0)"

 #endif

 

-#if ((NRF51_ST_USE_RTC0   == TRUE ? 1 : 0) + \

-     (NRF51_ST_USE_RTC1   == TRUE ? 1 : 0) + \

-     (NRF51_ST_USE_TIMER0 == TRUE ? 1 : 0)) > 1

+#if ((NRF5_ST_USE_RTC0   == TRUE ? 1 : 0) + \

+     (NRF5_ST_USE_RTC1   == TRUE ? 1 : 0) + \

+     (NRF5_ST_USE_TIMER0 == TRUE ? 1 : 0)) > 1

 #error "Only one clock source can be used (RTC0, RTC1, or TIMER0)"

 #endif

 

 #if defined(SOFTDEVICE_PRESENT)

-#if NRF51_ST_USE_RTC0 == TRUE

+#if NRF5_ST_USE_RTC0 == TRUE

 #error "RTC0 cannot be used for system ticks when SOFTDEVICE present"

 #endif

 

-#if NRF51_ST_USE_TIMER0 == TRUE

+#if NRF5_ST_USE_TIMER0 == TRUE

 #error "TIMER0 cannot be used for system ticks when SOFTDEVICE present"

 #endif

 

-#if NRF51_ST_PRIORITY != 1

+#if NRF5_ST_PRIORITY != 1

 #error "ST priority must be 1 when SOFTDEVICE present"

 #endif

 

@@ -118,12 +118,12 @@
 #if defined(CH_CFG_ST_TIMEDELTA) && (CH_CFG_ST_TIMEDELTA < 5)

 #error "CH_CFG_ST_TIMEDELTA is too low"

 #endif

-#if NRF51_ST_USE_TIMER0 == TRUE

+#if NRF5_ST_USE_TIMER0 == TRUE

 #error "Freeruning (tick-less) mode not supported with TIMER, use RTC"

 #endif

 #endif /* OSAL_ST_MODE == OSAL_ST_MODE_FREERUNNING */

 

-#if !OSAL_IRQ_IS_VALID_PRIORITY(NRF51_ST_PRIORITY)

+#if !OSAL_IRQ_IS_VALID_PRIORITY(NRF5_ST_PRIORITY)

 #error "Invalid IRQ priority assigned to ST driver"

 #endif

 

@@ -159,13 +159,13 @@ extern "C" {
  * @notapi

  */

 static inline systime_t st_lld_get_counter(void) {

-#if NRF51_ST_USE_RTC0 == TRUE

+#if NRF5_ST_USE_RTC0 == TRUE

   return (systime_t)NRF_RTC0->COUNTER;

 #endif

-#if NRF51_ST_USE_RTC1 == TRUE

+#if NRF5_ST_USE_RTC1 == TRUE

   return (systime_t)NRF_RTC1->COUNTER;

 #endif

-#if NRF51_ST_USE_TIMER0 == TRUE

+#if NRF5_ST_USE_TIMER0 == TRUE

   return (systime_t)0;

 #endif

 }

@@ -180,17 +180,17 @@ static inline systime_t st_lld_get_counter(void) {
  * @notapi

  */

 static inline void st_lld_start_alarm(systime_t abstime) {

-#if NRF51_ST_USE_RTC0 == TRUE

+#if NRF5_ST_USE_RTC0 == TRUE

   NRF_RTC0->CC[0]               = abstime;

   NRF_RTC0->EVENTS_COMPARE[0]   = 0;

   NRF_RTC0->EVTENSET            = RTC_EVTENSET_COMPARE0_Msk;

 #endif

-#if NRF51_ST_USE_RTC1 == TRUE

+#if NRF5_ST_USE_RTC1 == TRUE

   NRF_RTC1->CC[0]               = abstime;

   NRF_RTC1->EVENTS_COMPARE[0]   = 0;

   NRF_RTC1->EVTENSET            = RTC_EVTENSET_COMPARE0_Msk;

 #endif

-#if NRF51_ST_USE_TIMER0 == TRUE

+#if NRF5_ST_USE_TIMER0 == TRUE

   (void)abstime;

 #endif

 }

@@ -201,11 +201,11 @@ static inline void st_lld_start_alarm(systime_t abstime) {
  * @notapi

  */

 static inline void st_lld_stop_alarm(void) {

-#if NRF51_ST_USE_RTC0 == TRUE

+#if NRF5_ST_USE_RTC0 == TRUE

   NRF_RTC0->EVTENCLR            = RTC_EVTENCLR_COMPARE0_Msk;

   NRF_RTC0->EVENTS_COMPARE[0]   = 0;

 #endif

-#if NRF51_ST_USE_RTC1 == TRUE

+#if NRF5_ST_USE_RTC1 == TRUE

   NRF_RTC1->EVTENCLR            = RTC_EVTENCLR_COMPARE0_Msk;

   NRF_RTC1->EVENTS_COMPARE[0]   = 0;

 #endif

@@ -219,13 +219,13 @@ static inline void st_lld_stop_alarm(void) {
  * @notapi

  */

 static inline void st_lld_set_alarm(systime_t abstime) {

-#if NRF51_ST_USE_RTC0 == TRUE

+#if NRF5_ST_USE_RTC0 == TRUE

     NRF_RTC0->CC[0]             = abstime;

 #endif

-#if NRF51_ST_USE_RTC1 == TRUE

+#if NRF5_ST_USE_RTC1 == TRUE

     NRF_RTC1->CC[0]             = abstime;

 #endif

-#if NRF51_ST_USE_TIMER0 == TRUE

+#if NRF5_ST_USE_TIMER0 == TRUE

   (void)abstime;

 #endif

 }

@@ -238,13 +238,13 @@ static inline void st_lld_set_alarm(systime_t abstime) {
  * @notapi

  */

 static inline systime_t st_lld_get_alarm(void) {

-#if NRF51_ST_USE_RTC0 == TRUE

+#if NRF5_ST_USE_RTC0 == TRUE

   return (systime_t)NRF_RTC0->CC[0];

 #endif

-#if NRF51_ST_USE_RTC1 == TRUE

+#if NRF5_ST_USE_RTC1 == TRUE

   return (systime_t)NRF_RTC1->CC[0];

 #endif

-#if NRF51_ST_USE_TIMER0 == TRUE

+#if NRF5_ST_USE_TIMER0 == TRUE

   return (systime_t)0;

 #endif

 }

@@ -259,13 +259,13 @@ static inline systime_t st_lld_get_alarm(void) {
  * @notapi

  */

 static inline bool st_lld_is_alarm_active(void) {

-#if NRF51_ST_USE_RTC0 == TRUE

+#if NRF5_ST_USE_RTC0 == TRUE

   return NRF_RTC0->EVTEN & RTC_EVTEN_COMPARE0_Msk;

 #endif

-#if NRF51_ST_USE_RTC1 == TRUE

+#if NRF5_ST_USE_RTC1 == TRUE

   return NRF_RTC1->EVTEN & RTC_EVTEN_COMPARE0_Msk;

 #endif

-#if NRF51_ST_USE_TIMER0 == TRUE

+#if NRF5_ST_USE_TIMER0 == TRUE

   return false;

 #endif

 }