1 files changed, 31 insertions, 7 deletions
diff --git a/os/hal/ports/NRF51/NRF51822/serial_lld.c b/os/hal/ports/NRF51/NRF51822/serial_lld.c
index bc4a9b6..bddc4c3 100644
--- a/os/hal/ports/NRF51/NRF51822/serial_lld.c
+++ b/os/hal/ports/NRF51/NRF51822/serial_lld.c
@@ -49,9 +49,13 @@ SerialDriver SD1;
  * @brief   Driver default configuration.
  */
 static const SerialConfig default_config = {
-  .speed = 38400,
-  .tx_pad = NRF51_SERIAL_PAD_DISCONNECTED,
-  .rx_pad = NRF51_SERIAL_PAD_DISCONNECTED,
+  .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,
+#endif
 };
 
 /*===========================================================================*/
@@ -68,7 +72,6 @@ static const SerialConfig default_config = {
  */
 static void configure_uart(const SerialConfig *config)
 {
-  /* TODO: Add support for CTS/RTS! */
   uint32_t speed = UART_BAUDRATE_BAUDRATE_Baud250000;
 
   switch (config->speed) {
@@ -100,6 +103,16 @@ static void configure_uart(const SerialConfig *config)
     palSetPadMode(IOPORT1, config->rx_pad, PAL_MODE_INPUT);
     NRF_UART0->PSELRXD = config->rx_pad;
   }
+#if (NRF51_SERIAL_USE_HWFLOWCTRL == TRUE)
+  if (config->rts_pad != NRF51_SERIAL_PAD_DISCONNECTED) {
+    palSetPadMode(IOPORT1, config->rts_pad, PAL_MODE_OUTPUT_PUSHPULL);
+    NRF_UART0->PSELRTS = config->rts_pad;
+  }
+  if (config->cts_pad != NRF51_SERIAL_PAD_DISCONNECTED) {
+    palSetPadMode(IOPORT1, config->cts_pad, PAL_MODE_INPUT);
+    NRF_UART0->PSELCTS = config->cts_pad;
+  }
+#endif
 
   NRF_UART0->BAUDRATE = speed;
   NRF_UART0->CONFIG = (UART_CONFIG_PARITY_Excluded << UART_CONFIG_PARITY_Pos);
@@ -107,10 +120,21 @@ static void configure_uart(const SerialConfig *config)
   NRF_UART0->EVENTS_RXDRDY = 0;
   NRF_UART0->EVENTS_TXDRDY = 0;
 
-  NRF_UART0->CONFIG       &= ~(UART_CONFIG_HWFC_Enabled << UART_CONFIG_HWFC_Pos);
+#if (NRF51_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;
+  } else {
+      NRF_UART0->CONFIG &= ~(UART_CONFIG_HWFC_Enabled << UART_CONFIG_HWFC_Pos);
+  }
+  NRF_UART0->PSELRTS     = config->rts_pad;
+  NRF_UART0->PSELCTS     = config->cts_pad;
+#else
+  NRF_UART0->CONFIG     &= ~(UART_CONFIG_HWFC_Enabled << UART_CONFIG_HWFC_Pos);
 
-  NRF_UART0->PSELRTS       = NRF51_SERIAL_PAD_DISCONNECTED;
-  NRF_UART0->PSELCTS       = NRF51_SERIAL_PAD_DISCONNECTED;
+  NRF_UART0->PSELRTS     = NRF51_SERIAL_PAD_DISCONNECTED;
+  NRF_UART0->PSELCTS     = NRF51_SERIAL_PAD_DISCONNECTED;
+#endif
 
   if (config->rx_pad != NRF51_SERIAL_PAD_DISCONNECTED) {
     while (NRF_UART0->EVENTS_RXDRDY != 0) {