sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

usbuart: Renamed buf_rx -> aux_serial_receive_buffer

This commit is contained in:
dragonmux 2022-08-21 00:23:09 +01:00 committed by Piotr Esden-Tempski
parent 8a3b8a90e8
commit 90a0931f78
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/platforms/common/aux_serial.c
View File

@ -110,7 +110,7 @@ void aux_serial_init(void)
/* Setup USART RX DMA */
dma_channel_reset(USBUSART_DMA_BUS, USBUSART_DMA_RX_CHAN);
dma_set_peripheral_address(USBUSART_DMA_BUS, USBUSART_DMA_RX_CHAN, (uintptr_t)&USBUSART_RDR);
dma_set_memory_address(USBUSART_DMA_BUS, USBUSART_DMA_RX_CHAN, (uintptr_t)buf_rx);
dma_set_memory_address(USBUSART_DMA_BUS, USBUSART_DMA_RX_CHAN, (uintptr_t)aux_serial_receive_buffer);
dma_set_number_of_data(USBUSART_DMA_BUS, USBUSART_DMA_RX_CHAN, AUX_UART_BUFFER_SIZE);
dma_enable_memory_increment_mode(USBUSART_DMA_BUS, USBUSART_DMA_RX_CHAN);
dma_enable_circular_mode(USBUSART_DMA_BUS, USBUSART_DMA_RX_CHAN);
@ -444,7 +444,7 @@ void USBUART_ISR(void)
*/
if (((aux_serial_receive_write_index + 1) % AUX_UART_BUFFER_SIZE) != aux_serial_receive_read_index) {
/* insert into FIFO */
buf_rx[aux_serial_receive_write_index++] = c;
aux_serial_receive_buffer[aux_serial_receive_write_index++] = c;
/* wrap out pointer */
if (aux_serial_receive_write_index >= AUX_UART_BUFFER_SIZE)
@ -466,7 +466,7 @@ void USBUART_ISR(void)
/* copy from uart FIFO into local usb packet buffer */
while (aux_serial_receive_write_index != buf_out && packet_size < CDCACM_PACKET_SIZE) {
packet_buf[packet_size++] = buf_rx[buf_out++];
packet_buf[packet_size++] = aux_serial_receive_buffer[buf_out++];
/* wrap out pointer */
if (buf_out >= AUX_UART_BUFFER_SIZE)
@ -474,8 +474,7 @@ void USBUART_ISR(void)
}
/* advance fifo out pointer by amount written */
aux_serial_receive_read_index += usbd_ep_write_packet(usbdev,
CDCACM_UART_ENDPOINT, packet_buf, packet_size);
aux_serial_receive_read_index += usbd_ep_write_packet(usbdev, CDCACM_UART_ENDPOINT, packet_buf, packet_size);
aux_serial_receive_read_index %= AUX_UART_BUFFER_SIZE;
}
}

2
src/platforms/common/usb_serial.c
View File

@ -280,7 +280,7 @@ static void debug_uart_send_rx_packet(void)
#endif
/* Copy data from uart RX FIFO into local usb packet buffer */
packet_size = copy_from_fifo(packet_buf, buf_rx, aux_serial_receive_read_index, aux_serial_receive_write_index, CDCACM_PACKET_SIZE - 1, AUX_UART_BUFFER_SIZE);
packet_size = copy_from_fifo(packet_buf, aux_serial_receive_buffer, aux_serial_receive_read_index, aux_serial_receive_write_index, CDCACM_PACKET_SIZE - 1, AUX_UART_BUFFER_SIZE);
/* Advance fifo out pointer by amount written */
const uint16_t written = usbd_ep_write_packet(usbdev, CDCACM_UART_ENDPOINT, packet_buf, packet_size);

4
src/platforms/common/usbuart.h
View File

@ -41,7 +41,7 @@ void debug_uart_run(void);
#define AUX_UART_BUFFER_SIZE (USART_DMA_BUF_SIZE)
/* RX Fifo buffer with space for copy fn overrun */
extern char buf_rx[AUX_UART_BUFFER_SIZE + sizeof(uint64_t)];
extern char aux_serial_receive_buffer[AUX_UART_BUFFER_SIZE + sizeof(uint64_t)];
#ifdef ENABLE_DEBUG
/* Debug Fifo buffer with space for copy fn overrun */
@ -55,7 +55,7 @@ extern uint8_t usb_dbg_out;
#define AUX_UART_BUFFER_SIZE 128
/* RX Fifo buffer */
extern char buf_rx[AUX_UART_BUFFER_SIZE];
extern char aux_serial_receive_buffer[AUX_UART_BUFFER_SIZE];
#endif
extern uint8_t aux_serial_receive_read_index;

2
src/platforms/stm32/usbuart.c
View File

@ -39,7 +39,7 @@
#endif
/* RX Fifo buffer with space for copy fn overrun */
char buf_rx[AUX_UART_BUFFER_SIZE + sizeof(uint64_t)];
char aux_serial_receive_buffer[AUX_UART_BUFFER_SIZE + sizeof(uint64_t)];
#ifdef ENABLE_DEBUG
/* Debug Fifo buffer with space for copy fn overrun */

2
src/platforms/tm4c/usbuart.c
View File

@ -30,4 +30,4 @@
#include "usb.h"
/* RX Fifo buffer */
char buf_rx[AUX_UART_BUFFER_SIZE];
char aux_serial_receive_buffer[AUX_UART_BUFFER_SIZE];