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

avr: adapted to latest changes.

Browse Source
This commit is contained in:
Martin Preuss
2023-04-05 22:54:09 +02:00
parent d482340def
commit 981c30602d
3 changed files with 38 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
avr/comproto.asm
View File

@@ -43,16 +43,6 @@
.equ CPRO_PACKET_CLAIMADDR_OFFS_ADDRESS = COM_MSG_OFFS_PAYLOAD+4
.equ CPRO_PACKET_DENYADDR_OFFS_ADDRESS = COM_MSG_OFFS_PAYLOAD+4
.equ CPRO_PACKET_FLASH_START_OFFS_MSGNUM = COM_MSG_OFFS_PAYLOAD+0 ; 2 bytes
.equ CPRO_PACKET_FLASH_START_OFFS_ADDR = COM_MSG_OFFS_PAYLOAD+2 ; 2 bytes
.equ CPRO_PACKET_FLASH_ADDR_OFFS_MSGNUM = COM_MSG_OFFS_PAYLOAD+0 ; 2 bytes
.equ CPRO_PACKET_FLASH_ADDR_OFFS_ADDR = COM_MSG_OFFS_PAYLOAD+2 ; 2 bytes
.equ CPRO_PACKET_FLASH_DATA_OFFS_MSGNUM = COM_MSG_OFFS_PAYLOAD+0 ; 2 bytes
.equ CPRO_PACKET_FLASH_DATA_OFFS_ADDR = COM_MSG_OFFS_PAYLOAD+2 ; 2 bytes
.equ CPRO_PACKET_FLASH_DATA_OFFS_DATA = COM_MSG_OFFS_PAYLOAD+4 ; 2 bytes
.equ CPRO_WAITTIME_GETADDR = 130
.equ CPRO_WAITTIME_CLAIMADDR = 17
@@ -322,7 +312,7 @@ CPRO_EnqueueComRecvStats:
st X+, r16
lds r16, comStatsRecvErrs+1
st X+, r16
lds r16, comStatsHandled ; 10: ignored
lds r16, comStatsHandled ; 10: handled
st X+, r16
lds r16, comStatsHandled+1
st X+, r16
@@ -454,6 +444,8 @@ CPRO_EnqueueDebug_error:
#endif
#ifndef BASE_SYSTEM
; ---------------------------------------------------------------------------
; Enqueue a DEVICE packet.
;
@@ -494,12 +486,13 @@ CPRO_EnqueueDevice:
; mark buffer as enqueued with PRIO "normal" (slightly limited number of retries)
ldi r20, COM_BUFFER_PRIO_NORMAL
rcall COM_EnqueuePacket ; (R15, R16)
brcc CPRO_EnqueueValue_error
brcc CPRO_EnqueueDevice_error
sec
ret
CPRO_EnqueueDevice_error:
clc
ret
#endif
@@ -813,51 +806,4 @@ cproCalcPayloadSize_l2:
#ifdef WITH_FLASH
; ---------------------------------------------------------------------------
; Enqueue a FLASHDATA_ACK packet.
;
; IN:
; - R16: destination address
; - R17: ACK(1) or NAK(0)
; - R19:R18: msg num
; OUT:
; - CFLAG: set if okay, clear otherwise
; MODIFIED REGS: R6, R7, R8, R9, R10, R11, R12, R16, R17, X, Y (R3, R4, R15, R16, R17, R18, R19, R20, R21)
CPRO_EnqueueFlashRsp:
mov r6, r16
mov r7, r17
mov r8, r18
mov r9, r19
rcall COM_AllocBufferAndGetXY ; (r16, r17, r21)
brcc CPRO_EnqueueFlashRsp_error
push xh
push xl
mov r16, r6
ldi r17, CPRO_PAYLOAD_FLAGS_SECONDS | (3<<CPRO_PAYLOAD_FLAGS_SHIFT_NUM)
ldi r18, CPRO_CMD_FLASH_RSP
rcall cproBeginMsgWithVariablePayload ; (R3, R4, R16, R17, R18, R19, R20, R21, X)
st X+, r8 ; 4: msg num (low)
st X+, r9 ; 5: msg num (high)
st X+, r7 ; 6: ACK or NAK
pop xl
pop xh
rcall cproCalcAndAddChecksumByte
; mark buffer as enqueued with PRIO "important" (higher number of retries)
ldi r20, COM_BUFFER_PRIO_IMPORTANT
rcall COM_EnqueuePacket ; (R15, R16)
brcc CPRO_EnqueueFlashRsp_error
sec
ret
CPRO_EnqueueFlashRsp_error:
clc
ret
#endif