martin/aqhomecontrol
Public Access
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avr/uart_hw: tty1 works in send and receive direction.

Browse Source
This commit is contained in:
Martin Preuss
2025-03-22 13:00:20 +01:00
parent 236f6832a3
commit 0f598a5552
5 changed files with 206 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
avr/modules/uart_hw/lowlevel_uart1.asm
View File

@@ -97,7 +97,85 @@ UART_HW_Uart1_Flush:
; @clobbers R16 (R17, R18, R24, R25, X)
UART_HW_Uart1_RxCharIsr:
M_UART_HW_Uart_RxCharIsr 1
; check for errors
lds r16, UCSR1A ; check for errors
andi r16, (1<<FE1) | (1<<DOR1) | (1<<UPE1)
brne UART_HW_Uart1_RxCharIsr_hwerr
; read char
lds r16, UCSR1A
sbrs r16, RXC1
rjmp UART_HW_Uart1_RxCharIsr_end ; no data
lds r16, UDR1 ; r16=received char
; check read mode
ldd r17, Y+UART_HW_IFACE_OFFS_READMODE
cpi r17, UART_HW_READMODE_READING
breq UART_HW_Uart1_RxCharIsr_storeChar
cpi r17, UART_HW_READMODE_SKIPPING
breq UART_HW_Uart1_RxCharIsr_skipChar
rjmp UART_HW_Uart1_RxCharIsr_overrun ; neither read nor skip mode
UART_HW_Uart1_RxCharIsr_skipChar:
clr r16
std Y+NET_IFACE_OFFS_READTIMER, r16 ; reset read timer
rjmp UART_HW_Uart1_RxCharIsr_end
UART_HW_Uart1_RxCharIsr_storeChar:
mov r18, r16 ; r18=received char
; check buffer
ldd r16, Y+UART_HW_IFACE_OFFS_READBUFNUM
cpi r16, 0xff
breq UART_HW_Uart1_RxCharIsr_overrun
; check for buffer overrun
ldd r17, Y+UART_HW_IFACE_OFFS_READBUFLEFT ; r17=bytes left
tst r17
breq UART_HW_Uart1_RxCharIsr_econtent ; msg too long
; actually store byte, increment/decrement counters and pos
ldd xl, Y+UART_HW_IFACE_OFFS_READBUFPOS_LOW
ldd xh, Y+UART_HW_IFACE_OFFS_READBUFPOS_HIGH
st X+, r18 ; r18=byte to store
clr r16
std Y+NET_IFACE_OFFS_READTIMER, r16 ; reset read timer
std Y+UART_HW_IFACE_OFFS_READBUFPOS_LOW, xl
std Y+UART_HW_IFACE_OFFS_READBUFPOS_HIGH, xh
ldd r18, Y+UART_HW_IFACE_OFFS_READBUFUSED ; r18=bytes in buffer
inc r18
std Y+UART_HW_IFACE_OFFS_READBUFUSED, r18
dec r17
std Y+UART_HW_IFACE_OFFS_READBUFLEFT, r17
breq UART_HW_Uart1_RxCharIsr_msgFinished
; check msg size
cpi r18, 2 ; bytes in buffer, exactly 2?
brne UART_HW_Uart1_RxCharIsr_end ; nope, done
sbiw xh:xl, 1 ; yes, determine message length (msgLen at previous pos)
ld r16, X+ ; read payload length byte
subi r16, -3 ; add 3 (dest addr, length, crc byte)
cpi r16, (NET_BUFFERS_SIZE-1) ; total msg length ok?
brcc UART_HW_Uart1_RxCharIsr_econtent ; content error (msg too long)
subi r16, 2 ; subtract bytes already received
std Y+UART_HW_IFACE_OFFS_READBUFLEFT, r16 ; set new number of bytes left
brne UART_HW_Uart1_RxCharIsr_end ; jmp if still bytes left to receive
UART_HW_Uart1_RxCharIsr_msgFinished:
ldi r16, NET_IFACE_OFFS_PACKETSIN_LOW
ldi r17, UART_HW_READMODE_MSGRECEIVED
rjmp UART_HW_Uart1_RxCharIsr_incCounterAndEnterMode
UART_HW_Uart1_RxCharIsr_hwerr:
ldi r16, NET_IFACE_OFFS_ERR_IO_LOW
rjmp UART_HW_Uart1_RxCharIsr_incCounterAndEnterSkipping
UART_HW_Uart1_RxCharIsr_econtent:
ldi r16, NET_IFACE_OFFS_ERR_CONTENT_LOW
rjmp UART_HW_Uart1_RxCharIsr_incCounterAndEnterSkipping
UART_HW_Uart1_RxCharIsr_overrun:
ldi r16, NET_IFACE_OFFS_ERR_NOBUF_LOW
UART_HW_Uart1_RxCharIsr_incCounterAndEnterSkipping:
ldi r17, UART_HW_READMODE_SKIPPING
UART_HW_Uart1_RxCharIsr_incCounterAndEnterMode:
rcall NET_Interface_IncCounter16 ; (R24, R25)
std Y+UART_HW_IFACE_OFFS_READMODE, r17 ; set read mode
UART_HW_Uart1_RxCharIsr_end:
ret
; @end
ret
; @end