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

avr: use NETMSG functions, increase waiting times.

Browse Source
This commit is contained in:
Martin Preuss
2025-03-25 00:38:12 +01:00
parent aee2c384c8
commit cac611deae
4 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
avr/modules/flash/flashprocess.asm
View File

@@ -82,7 +82,7 @@ checkFlash_end:
flashProcess: flashProcess:
rcall Flash_Init rcall Flash_Init
flashProcess_loop1: flashProcess_loop1:
; wait up to 10s for incoming FLASH_DATA message ; wait up to 20s for incoming FLASH_DATA message
ldi r16, CPRO_CMD_FLASH_DATA ldi r16, CPRO_CMD_FLASH_DATA
rcall ioWaitForGivenMsg ; (r16, r17, r18, r19, r20, r22, X) rcall ioWaitForGivenMsg ; (r16, r17, r18, r19, r20, r22, X)
brcc flashProcess_end ; no FLASH_DATA or FLASH_END msg brcc flashProcess_end ; no FLASH_DATA or FLASH_END msg
@@ -244,7 +244,7 @@ flashProcessWriteFlashRsp:
st X+, r17 ; src address (not used) st X+, r17 ; src address (not used)
st X+, r16 ; payload byte st X+, r16 ; payload byte
sbiw xh:xl, 5 sbiw xh:xl, 5
rcall com2CalcAndAddChecksumByte ; (R16, R17, R18, R19, R20, X) rcall NETMSG_CalcAndAddChecksumByte ; (R16, R17, R18, R19, R20, X)
sbiw xh:xl, 6 sbiw xh:xl, 6
ret ret
; @end ; @end
@@ -259,33 +259,33 @@ flashProcessWriteFlashRsp:
flashProcessWriteFlashReady: flashProcessWriteFlashReady:
ldi r16, 0xff ldi r16, 0xff
st X+, r16 ; dest address (unused) st X+, r16 ; dest address (unused)
ldi r16, 20 ; msg code+src address+18 payload bytes ldi r16, 20 ; msg code+src address+18 payload bytes
st X+, r16 ; msg len st X+, r16 ; msg len
ldi r16, CPRO_CMD_FLASH_READY ldi r16, CPRO_CMD_FLASH_READY
st X+, r16 ; msg code st X+, r16 ; msg code
ldi r16, COM2_MAINTENANCE_ADDR ldi r16, COM2_MAINTENANCE_ADDR
st X+, r16 ; src address st X+, r16 ; src address
; payload ; payload
ldi yh, HIGH(flashUid) ; 4 bytes ldi yh, HIGH(flashUid) ; 4 bytes
ldi yl, LOW(flashUid) ldi yl, LOW(flashUid)
ldi r18, 4 ldi r18, 4
rcall Utils_Copy_SDRAM ; (R17, R18, X, Y) rcall Utils_Copy_SDRAM ; (R17, R18, X, Y)
ldi zl, LOW(devInfoBlock*2) ; 12 bytes ldi zl, LOW(devInfoBlock*2) ; 12 bytes
ldi zh, HIGH(devInfoBlock*2) ldi zh, HIGH(devInfoBlock*2)
ldi r18, 12 ldi r18, 12
rcall Utils_CopyFromFlash ; (R16, R18, X, Z) rcall Utils_CopyFromFlash ; (R16, R18, X, Z)
ldi r16, LOW(PAGESIZE*2) ; 2 bytes ldi r16, LOW(PAGESIZE*2) ; 2 bytes
st X+, r16 st X+, r16
ldi r16, HIGH(PAGESIZE*2) ldi r16, HIGH(PAGESIZE*2)
st X+, r16 st X+, r16
sbiw xh:xl, 22 ; go back to beginning of message sbiw xh:xl, 22 ; go back to beginning of message
rcall com2CalcAndAddChecksumByte ; (R16, R17, R18, R19, R20, X) rcall NETMSG_CalcAndAddChecksumByte ; (R16, R17, R18, R19, R20, X)
sbiw xh:xl, 23 ; go back to beginning of message sbiw xh:xl, 23 ; go back to beginning of message
ret ret
; @end ; @end

2
avr/modules/flash/io.asm
View File

@@ -25,7 +25,7 @@
; @clobbers: r16, r17, r20, X (r18, r19, r22) ; @clobbers: r16, r17, r20, X (r18, r19, r22)
ioWaitForGivenMsg: ioWaitForGivenMsg:
ldi r20, 10 ; number of tries ldi r20, 100 ; number of tries
ioWaitForGivenMsg_loop: ioWaitForGivenMsg_loop:
push r16 push r16
push r20 push r20

14
avr/modules/flash/io_bitbang.asm
View File

@@ -123,9 +123,9 @@ ioRawSendMsg_attnHigh:
; @clobbers: r16, r17 (r18, r19, r20, r21, r22, X) ; @clobbers: r16, r17 (r18, r19, r20, r21, r22, X)
ioRawWaitForValidMsg: ioRawWaitForValidMsg:
ldi r16, 0 ; expect ATTN low ldi r16, 0 ; expect ATTN low
ldi r17, 100 ldi r17, 200
rcall ioWaitForAttnState100ms ; wait for up to 10s rcall ioWaitForAttnState100ms ; wait for up to 20s
brcs ioRawWaitForValidMsg_attnLow brcs ioRawWaitForValidMsg_attnLow
ret ret
ioRawWaitForValidMsg_attnLow: ioRawWaitForValidMsg_attnLow:
@@ -137,13 +137,13 @@ ioRawWaitForValidMsg_attnLow:
brcs ioRawWaitForValidMsg_packetReceived brcs ioRawWaitForValidMsg_packetReceived
ret ret
ioRawWaitForValidMsg_packetReceived: ioRawWaitForValidMsg_packetReceived:
ldi r16, 0xff ; expect ATTN high ldi r16, 0xff ; expect ATTN high
ldi r17, 100 ldi r17, 200
rcall ioWaitForAttnState100ms ; wait for up to 10s rcall ioWaitForAttnState100ms ; wait for up to 20s
brcc ioRawWaitForValidMsg_end brcc ioRawWaitForValidMsg_end
ldi xl, LOW(flashRecvBuffer) ldi xl, LOW(flashRecvBuffer)
ldi xh, HIGH(flashRecvBuffer) ldi xh, HIGH(flashRecvBuffer)
rcall com2CheckMessageInBuffer ; (R16, R17, R18, R19, R20, X) rcall NETMSG_CheckMessageInBuffer
ioRawWaitForValidMsg_end: ioRawWaitForValidMsg_end:
ret ret
; @end ; @end

2
avr/modules/flash/io_uart1.asm
View File

@@ -132,7 +132,7 @@ ioRecvMsg:
brcc ioRecvMsg_error brcc ioRecvMsg_error
push xl push xl
push xh push xh
rcall com2CheckMessageInBuffer ; (R16, R17, R18, R19, R20, X) rcall NETMSG_CheckMessageInBuffer ; (R16, R17, R18, R19, R20, X)
pop xh pop xh
pop xl pop xl
brcs ioRecvMsg_end brcs ioRecvMsg_end