Merge pull request #248 from Max-Plastix/static-uart-buffer

Quency-D · web-flow · commit 2300ef23c972 · 2022-09-19T14:17:01.000+08:00
Statically allocate UART Receive buffers
diff --git a/cores/asr650x/Serial/HardwareSerial.cpp b/cores/asr650x/Serial/HardwareSerial.cpp
@@ -137,7 +137,6 @@ bool HardwareSerial::begin(uint32_t baud, uint32_t config, int rxPin, int txPin,
 	}
 	_rxbuff[_uart_num].rx_r=0;
 	_rxbuff[_uart_num].rx_w=0;
-	_rxbuff[_uart_num].rx_buf=(uint8_t*) malloc(UART_RX_SIZE);
 
 	if( _uart_num == UART_NUM_0) 
 	{
@@ -176,7 +175,6 @@ void HardwareSerial::updateBaudRate(unsigned long baud)
 
 void HardwareSerial::end()
 {
-  free(_rxbuff[_uart_num].rx_buf);
 	if( _uart_num == UART_NUM_0)
 	{
 		UART_1_Stop();
diff --git a/cores/asr650x/Serial/HardwareSerial.h b/cores/asr650x/Serial/HardwareSerial.h
@@ -60,7 +60,7 @@
 #define UART_RX_SIZE (UART_BUFF_SIZE+1)
 
 typedef struct {
-    uint8_t * rx_buf;
+    uint8_t rx_buf[UART_RX_SIZE];
     uint16_t rx_w;
     uint16_t rx_r;
 } uart_rxbuff_t;

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,6 @@ bool HardwareSerial::begin(uint32_t baud, uint32_t config, int rxPin, int txPin,`
`137`	`137`	`}`
`138`	`138`	`_rxbuff[_uart_num].rx_r=0;`
`139`	`139`	`_rxbuff[_uart_num].rx_w=0;`
`140`		`- _rxbuff[_uart_num].rx_buf=(uint8_t*) malloc(UART_RX_SIZE);`
`141`	`140`
`142`	`141`	`if( _uart_num == UART_NUM_0)`
`143`	`142`	`{`
`@@ -176,7 +175,6 @@ void HardwareSerial::updateBaudRate(unsigned long baud)`
`176`	`175`
`177`	`176`	`void HardwareSerial::end()`
`178`	`177`	`{`
`179`		`- free(_rxbuff[_uart_num].rx_buf);`
`180`	`178`	`if( _uart_num == UART_NUM_0)`
`181`	`179`	`{`
`182`	`180`	`UART_1_Stop();`