Git-Mirrors/tillitis-key
1
0
Fork 0
mirror of https://github.com/tillitis/tillitis-key1.git synced 2024-10-01 01:45:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Wrap accesses to UART output buffers

Browse Source
This commit is contained in:
Mikael Ågren 2024-09-17 13:36:39 +02:00
parent 89ff08cb69
commit f9feb2e74d
No known key found for this signature in database
GPG Key ID: E02DA3D397792C46
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/usb_interface/ch552_fw/main.c
View File

@ -997,19 +997,19 @@ void main()
FrameMode = UartRxBuf[UartRxBufOutputPointer]; // Extract frame mode FrameMode = UartRxBuf[UartRxBufOutputPointer]; // Extract frame mode
if ((FrameMode == MODE_CDC) || if ((FrameMode == MODE_CDC) ||
(FrameMode == MODE_HID)) { (FrameMode == MODE_HID)) {
FrameLength = UartRxBuf[UartRxBufOutputPointer + 1]; // Extract frame length FrameLength = UartRxBuf[increment_pointer(UartRxBufOutputPointer, 1, UART_RX_BUF_SIZE)]; // Extract frame length
FrameStarted = 1; FrameStarted = 1;
} else { // Invalid mode } else { // Invalid mode
if (!Halted) { if (!Halted) {
printStr("Invalid header: 0x"); printStr("Invalid header: 0x");
printNumHex(FrameMode); printNumHex(FrameMode);
printStr(", len = "); printStr(", len = ");
printNumU32(UartRxBuf[UartRxBufOutputPointer + 1]); printNumU32(UartRxBuf[increment_pointer(UartRxBufOutputPointer, 1, UART_RX_BUF_SIZE)]);
printStr("\n"); printStr("\n");
uint16_t i; uint16_t i;
uint8_t print_char_count_out = 0; uint8_t print_char_count_out = 0;
for (i=0; i<UART_RX_BUF_SIZE; i++) { for (i=0; i<UART_RX_BUF_SIZE; i++) {
printNumHex(UartRxBuf[(UartRxBufOutputPointer + i) % UART_RX_BUF_SIZE]); printNumHex(UartRxBuf[increment_pointer(UartRxBufOutputPointer, i, UART_RX_BUF_SIZE)]);
print_char_count_out++; print_char_count_out++;
if (print_char_count_out >= 16) { if (print_char_count_out >= 16) {
printStr("\n"); printStr("\n");
@ -1040,7 +1040,7 @@ void main()
if (FrameStarted) { if (FrameStarted) {
// Check if a complete frame has been received, include one mode byte and and one length byte // Check if a complete frame has been received, include one mode byte and and one length byte
if (UartRxBufByteCount >= (FrameLength + 2)) { if (UartRxBufByteCount >= (FrameLength + 2)) {
UartRxBufOutputPointer+=2; // Start at valid data so skip the mode and length byte UartRxBufOutputPointer = increment_pointer(UartRxBufOutputPointer, 2, UART_RX_BUF_SIZE); // Start at valid data so skip the mode and length byte
if (FrameMode == MODE_CDC) { if (FrameMode == MODE_CDC) {
circular_copy(CdcRxBuf + CdcRxBufLength, circular_copy(CdcRxBuf + CdcRxBufLength,
UartRxBuf, UartRxBuf,