X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fuart_i.c;fp=test_src%2Fuart_i.c;h=37c6c7da1f0a210ada7a89e7a603ff48a06c8bee;hb=3fdf0954404224cef94db2086348b3fa6020aaa4;hp=188198816211803b3e19e1147c15f4ef7f3a48b4;hpb=4f19c43af8afeb3c569eb7b4aa15907832cf8e5c;p=arm-crypto-lib.git

diff --git a/test_src/uart_i.c b/test_src/uart_i.c
index 1881988..37c6c7d 100644
--- a/test_src/uart_i.c
+++ b/test_src/uart_i.c
@@ -23,7 +23,7 @@
 #include "hw_uart_regs.h"
 #include "uart_defines.h"
 #include "circularbytebuffer.h"
-
+#include "uart_lowlevel.h"
 
 static const
 uint32_t uart_base[] = { UART0_BASE, UART1_BASE, UART2_BASE };
@@ -54,6 +54,10 @@ static const
 uint32_t uart_rx_buffersize[] = {128, 128, 128};
 static const
 uint32_t uart_tx_buffersize[] = {256, 256, 256};
+static
+uint8_t uart_swflowctrl_en[] = {0, 0, 0};
+static
+uint8_t uart_swflowctrl_halt[] = {0, 0, 0};
 
 static
 circularbytebuffer_t uart_rx_buffer[3];
@@ -67,7 +71,6 @@ static
 void uart_rx_isr(uint8_t uartno);
 
 void uart0_isr(void){
-
 	if(HW_REG(UART0_BASE+UARTMIS_OFFSET)&_BV(UART_TXMIS)){
 //		HW_REG(uart_base[0]+UARTDR_OFFSET) = 'X';
 		uart_tx_isr(UART_0);
@@ -81,7 +84,8 @@ static
 void uart_tx_isr(uint8_t uartno){
 	uint32_t tmp;
 	tmp = circularbytebuffer_cnt(&(uart_tx_buffer[uartno]));
-	while(tmp-- && (!(HW_REG(uart_base[uartno]+UARTFR_OFFSET)&_BV(UART_TXFF)))){
+	while(tmp-- && (!(HW_REG(uart_base[uartno]+UARTFR_OFFSET)&_BV(UART_TXFF)))
+		  && !(uart_swflowctrl_en[uartno] && uart_swflowctrl_halt[uartno])){
 		HW_REG(uart_base[uartno]+UARTDR_OFFSET)
 				= (uint32_t)circularbytebuffer_get_fifo(&(uart_tx_buffer[uartno]));
 	}
@@ -93,7 +97,19 @@ void uart_rx_isr(uint8_t uartno){
 	uint8_t c;
 	while(!HW_REG(uart_base[uartno]+UARTFR_OFFSET)&_BV(UART_RXFE)){
 		c = HW_REG(uart_base[uartno]+UARTDR_OFFSET);
-		circularbytebuffer_append(c, &(uart_rx_buffer[uartno]));
+		if(uart_swflowctrl_en[uartno]){
+			circularbytebuffer_append(c, &(uart_rx_buffer[uartno]));
+		}else{
+			if(c==UART_XON_CHAR){
+				uart_swflowctrl_halt[uartno] = 0;
+			}else{
+				if(c==UART_XOFF_CHAR){
+					uart_swflowctrl_halt[uartno] = 1;
+				}else{
+					circularbytebuffer_append(c, &(uart_rx_buffer[uartno]));
+				}
+			}
+		}
 	}
 	HW_REG(uart_base[uartno]+UARTICR_OFFSET) |= _BV(UART_RXIC);
 }
@@ -111,6 +127,10 @@ void calc_baud_values(uint32_t baudrate, uint16_t* intdivider, uint8_t* fracdivi
 }
 
 uint8_t uart_init(uint8_t uartno, uint32_t baudrate, uint8_t databits, uint8_t paraty, uint8_t stopbits){
+	return uart_init_flow(uartno, baudrate, databits, paraty, stopbits, 0);
+}
+
+uint8_t uart_init_flow(uint8_t uartno, uint32_t baudrate, uint8_t databits, uint8_t paraty, uint8_t stopbits, uint8_t flowctrl){
 	uint32_t tmp;
 	if(databits>=5){
 		databits-=5;
@@ -195,6 +215,13 @@ uint8_t uart_init(uint8_t uartno, uint32_t baudrate, uint8_t databits, uint8_t p
 	} else {
 		HW_REG(uart_base[uartno]+UARTCTL_OFFSET) &= ~_BV(UART_HSE);
 	}
+	/* set flow control */
+	if(flowctrl==UART_FLOWCTRL_SOFT){
+		uart_swflowctrl_en[uartno] = 1;
+		uart_swflowctrl_halt[uartno] = 0;
+	}else{
+		uart_swflowctrl_en[uartno] = 0;
+	}
 	/* uart interrupt enable */
 	HW_REG(uart_base[uartno]+UARTIM_OFFSET) |= _BV(UART_TXIM) | _BV(UART_RXIM);
 	HW_REG(ISR_ENABLE_VECTOR+uart_isr_vector[uartno]/32) |=