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

avr/uart_hw: basically works for a while then stops...

Browse Source
This commit is contained in:
Martin Preuss
2025-03-21 20:55:50 +01:00
parent 2964347e7b
commit 373a553ac8
14 changed files with 685 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
avr/modules/network/buffer.asm
View File

@@ -11,10 +11,6 @@
; ===========================================================================
; defs
.equ NET_BUFFER_INUSE_BIT = 7
.equ NET_BUFFER_IFACENUM1_BIT = 1
.equ NET_BUFFER_IFACENUM0_BIT = 0
@@ -50,7 +46,7 @@ NET_Buffer_Alloc:
ldi xh, HIGH(netBuffers)
m_fixedbuf_reserve NET_BUFFERS_SIZE, NET_BUFFERS_NUM
brcc NET_Buffer_Alloc_end
ldi r17, (1<<NET_BUFFER_INUSE_BIT)
ldi r17, (1<<NET_IFACE_BUFFER_INUSE_BIT)
st X, r17
NET_Buffer_Alloc_end:
ret
@@ -78,7 +74,7 @@ NET_Buffer_ReleaseByAddr:
; @clobbers X (R16)
NET_Buffer_ReleaseByNum:
rcall NET_Buffer_Locate ; (R16)
rcall NET_Buffer_Locate ; (R16, X)
brcc NET_Buffer_ReleaseByNum_end
rcall NET_Buffer_ReleaseByAddr ; (R16)
NET_Buffer_ReleaseByNum_end:

2
avr/modules/network/data.asm
View File

@@ -13,7 +13,7 @@
networkDataBegin:
; buffers for incoming and outgoing messages
netBuffers: .byte NET_BUFFERS_NUM*NET_BUFFERS_SIZE
netRingBufferMsgNumIn: .byte NET_MSGNUMINBUF_SIZE
netRingBufferMsgNumIn: .byte RINGBUFFERY_SIZE+NET_MSGNUMINBUF_SIZE
networkDataEnd:

5
avr/modules/network/defs.asm
View File

@@ -13,6 +13,11 @@
.equ NET_IFACE_OUTMSGBUF_SIZE = 4 ; max buffer nums in ringbuffer (per interface outbound)
.equ NET_IFACE_BUFFER_INUSE_BIT = 7
.equ NET_IFACE_BUFFER_IFACENUM1_BIT = 1
.equ NET_IFACE_BUFFER_IFACENUM0_BIT = 0
; interface generic data
.equ NET_IFACE_OFFS_IFACENUM = 0 ; interface number (put into received messages)
.equ NET_IFACE_OFFS_ADDRESS = 1

17
avr/modules/network/iface.asm
View File

@@ -163,5 +163,22 @@ NET_Interface_IncCounter16_end:
; ---------------------------------------------------------------------------
; @routine NET_Interface_SetIfaceNumInBuffer @global
;
; @param X pointer to start of buffer
; @param Y pointer to start of interface data
; @clobbers R16, R17
NET_Interface_SetIfaceNumInBuffer:
ldd r16, Y+NET_IFACE_OFFS_IFACENUM
andi r16, (NET_IFACE_BUFFER_IFACENUM1_BIT | NET_IFACE_BUFFER_IFACENUM0_BIT)
ld r17, X
andi r17, ~(NET_IFACE_BUFFER_IFACENUM1_BIT | NET_IFACE_BUFFER_IFACENUM0_BIT)
or r17, r16
st X, r17
ret
; @end

1
avr/modules/network/main.asm
View File

@@ -64,7 +64,6 @@ NET_AddIncomingMsgNum:
;
; @return CFLAG on success, cleared on error
; @return R16 buffer number of the next incoming message
; @param Y pointer to start of interface data
; @clobbers R17, R18, X
NET_GetNextIncomingMsgNum:

1
avr/modules/network/msg/0BUILD
View File

@@ -5,6 +5,7 @@
<extradist>
common.asm
defs.asm
debug-w.asm
device-w.asm
memstats-w.asm
recvstats-w.asm

53
avr/modules/network/msg/debug-w.asm Normal file
View File

@@ -0,0 +1,53 @@
; ***************************************************************************
; copyright : (C) 2025 by Martin Preuss
; email : martin@libchipcard.de
;
; ***************************************************************************
; * This file is part of the project "AqHome". *
; * Please see toplevel file COPYING of that project for license details. *
; ***************************************************************************
; ---------------------------------------------------------------------------
; @routine NETMSG_Debug_Write @global
;
; @param Y pointer to device to write msg for
; @param X pointer to buffer to write to
; @param r0-14 value 1-15
; @clobbers R16, R17, R18, R19, R20, R21
NETMSG_Debug_Write:
ldi r16, 0xff
st X+, r16 ; dest address
ldi r16, 17 ; msg code+src address+15 payload bytes
st X+, r16 ; msg len
ldi r16, NETMSG_CMD_DEBUG
st X+, r16 ; msg code
ldd r16, Y+NET_IFACE_OFFS_ADDRESS
st X+, r16 ; src address
st X+, r0 ; 5th byte
st X+, r1
st X+, r2
st X+, r3
st X+, r4
st X+, r5
st X+, r6
st X+, r7
st X+, r8
st X+, r9
st X+, r10
st X+, r11
st X+, r12
st X+, r13
st X+, r14
sbiw xh:xl, 19 ; go back to beginning of message (1 byte dst addr, 1 byte length, 17 bytes payload)
rcall NETMSG_CalcAndAddChecksumByte ; (R16, R17, R18, R19, R20, X)
sbiw xh:xl, 20 ; go back to beginning of message (1 byte dst addr, 1 byte length, 17 bytes payload, 1 byte crc)
ret
; @end