From 5259158d1727f3703bc90f88d50938eada316f67 Mon Sep 17 00:00:00 2001 From: Stephane D'Alu Date: Sun, 10 Jul 2016 10:48:04 +0200 Subject: renamed NRF51_* to NRF5_* --- os/hal/ports/NRF5/LLD/hal_serial_lld.c | 56 +++++++++++++++++----------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'os/hal/ports/NRF5/LLD/hal_serial_lld.c') 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; -- cgit v1.2.3