From 2171803ecd1f0380287487a51bcc813a4d61fbff Mon Sep 17 00:00:00 2001
From: Matthias Ringwald <matthias@ringwald.ch>
Date: Thu, 19 Nov 2020 10:09:28 +0100
Subject: [PATCH] msp432p401lp-cc256x: config baudrate on init, config alt dma
 transfer for rx

---
 port/msp432p401lp-cc256x/main.c | 37 +++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/port/msp432p401lp-cc256x/main.c b/port/msp432p401lp-cc256x/main.c
index 21dd40486..dd2e70a74 100755
--- a/port/msp432p401lp-cc256x/main.c
+++ b/port/msp432p401lp-cc256x/main.c
@@ -171,6 +171,7 @@ void hal_led_toggle(void){
 
 // HAL UART DMA
 
+#include "hal_uart_dma.h"
 // DMA Control Table
 // if not all channels are used, the alignment can be finer
 // GCC
@@ -302,24 +303,11 @@ static uint16_t hal_dma_rx_bytes_avail(uint8_t buffer, uint16_t offset){
     return HAL_DMA_RX_BUFFER_SIZE - MAP_DMA_getChannelSize(channel) - offset;
 }
 
-void DMA_INT1_IRQHandler(void)
-{
-    MAP_DMA_clearInterruptFlag(DMA_CH4_EUSCIA2TX & 0x0F);
-    MAP_DMA_disableChannel(DMA_CH4_EUSCIA2TX & 0x0F);
-    (*tx_done_handler)();
-}
-
-void DMA_INT2_IRQHandler(void)
-{
-    MAP_DMA_clearInterruptFlag(DMA_CH5_EUSCIA2RX & 0x0F);
-    // raise our RTS
-    GPIO_setOutputHighOnPin(BLUETOOTH_CTS_PORT, BLUETOOTH_CTS_PIN);
-}
-
 static void hal_uart_dma_harvest(void){
     if (bytes_to_read == 0) return;
     // get bytes from current buffer
     uint16_t bytes_avail = hal_dma_rx_bytes_avail(hal_dma_rx_active_buffer, hal_dma_rx_offset);
+    if (bytes_avail == 0) return;
     uint16_t bytes_to_copy = btstack_min(bytes_avail, bytes_to_read);
     memcpy(rx_buffer_ptr, &hal_dma_rx_ping_pong_buffer[hal_dma_rx_active_buffer * HAL_DMA_RX_BUFFER_SIZE + hal_dma_rx_offset], bytes_to_copy);
     rx_buffer_ptr += bytes_to_copy;
@@ -337,6 +325,23 @@ static void hal_uart_dma_harvest(void){
     }
 }
 
+void DMA_INT1_IRQHandler(void)
+{
+    MAP_DMA_clearInterruptFlag(DMA_CH4_EUSCIA2TX & 0x0F);
+    MAP_DMA_disableChannel(DMA_CH4_EUSCIA2TX & 0x0F);
+    (*tx_done_handler)();
+}
+
+void DMA_INT2_IRQHandler(void)
+{
+    MAP_DMA_clearInterruptFlag(DMA_CH5_EUSCIA2RX & 0x0F);
+    // raise our RTS
+    GPIO_setOutputHighOnPin(BLUETOOTH_CTS_PORT, BLUETOOTH_CTS_PIN);
+
+    hal_uart_dma_harvest();
+}
+
+
 void hal_uart_dma_init(void){
     // nShutdown
     MAP_GPIO_setAsOutputPin(BLUETOOTH_nSHUTDOWN_PORT, BLUETOOTH_nSHUTDOWN_PIN);
@@ -352,6 +357,7 @@ void hal_uart_dma_init(void){
     // UART
 
     /* Configuring and enable UART Module */
+    hal_uart_dma_config(115200);
     MAP_UART_initModule(EUSCI_A2_BASE, &uartConfig);
     MAP_UART_enableModule(EUSCI_A2_BASE);
 
@@ -368,6 +374,7 @@ void hal_uart_dma_init(void){
     /* Setup the RX and TX transfer characteristics */
     MAP_DMA_setChannelControl(DMA_CH4_EUSCIA2TX | UDMA_PRI_SELECT, UDMA_SIZE_8 | UDMA_SRC_INC_8 | UDMA_DST_INC_NONE | UDMA_ARB_1);
     MAP_DMA_setChannelControl(DMA_CH5_EUSCIA2RX | UDMA_PRI_SELECT, UDMA_SIZE_8 | UDMA_SRC_INC_NONE | UDMA_DST_INC_8 | UDMA_ARB_1);
+    MAP_DMA_setChannelControl(DMA_CH5_EUSCIA2RX | UDMA_ALT_SELECT, UDMA_SIZE_8 | UDMA_SRC_INC_NONE | UDMA_DST_INC_8 | UDMA_ARB_1);
 
     /* Enable DMA interrupt for both channels */
     MAP_DMA_assignInterrupt(INT_DMA_INT1, DMA_CH4_EUSCIA2TX & 0x0f);
@@ -545,8 +552,6 @@ int main(void)
     // hand over to btstack embedded code
     btstack_main(0, NULL);
 
-    hci_power_control(HCI_POWER_ON);
-
     // go
     btstack_run_loop_execute();
 }