reworked com stack.
- prepared for use of CRC8 - organized code in more files - recv stats message now contains crc errors and io errors
This commit is contained in:
Martin Preuss
468
avr/comproto.asm
468
avr/comproto.asm
@@ -187,10 +187,6 @@ cproHandlePing_notHandled:
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; Enqueue a PING packet.
|
||||
;
|
||||
@@ -223,443 +219,6 @@ CPRO_EnqueuePong:
|
||||
|
||||
|
||||
|
||||
#ifndef BASE_SYSTEM
|
||||
; ---------------------------------------------------------------------------
|
||||
; Enqueue a COM Send stats packet.
|
||||
;
|
||||
; IN:
|
||||
; - R16: destination address
|
||||
; OUT:
|
||||
; - CFLAG: set if okay, clear otherwise
|
||||
; MODIFIED REGS: R16, R17, R20, X (R15, Y)
|
||||
|
||||
CPRO_EnqueueComSendStats:
|
||||
push r15
|
||||
in r15, SREG
|
||||
cli
|
||||
push r16
|
||||
rcall COM_AllocBufferAndGetXY ; (r16, r17, r21)
|
||||
pop r16
|
||||
brcc CPRO_EnqueueComSendStats_error
|
||||
|
||||
ldi r17, CPRO_PAYLOAD_FLAGS_UID | (6<<CPRO_PAYLOAD_FLAGS_SHIFT_NUM) ; seconds + 6 bytes payload
|
||||
ldi r18, CPRO_CMD_COMSENDSTATS
|
||||
push xh
|
||||
push xl
|
||||
rcall cproBeginMsgWithVariablePayload ; (R3, R4, R16, R17, R18, R19, R20, R21, X)
|
||||
lds r16, comStatsPacketsOut ; 6: packets out
|
||||
st X+, r16
|
||||
lds r16, comStatsPacketsOut+1
|
||||
st X+, r16
|
||||
lds r16, comStatsCollisions ; 8: collisions
|
||||
st X+, r16
|
||||
lds r16, comStatsCollisions+1
|
||||
st X+, r16
|
||||
lds r16, comStatsAborted ; 10: aborted
|
||||
st X+, r16
|
||||
lds r16, comStatsAborted+1
|
||||
st X+, r16
|
||||
pop xl
|
||||
pop xh
|
||||
rcall cproCalcAndAddChecksumByte
|
||||
|
||||
; mark buffer as enqueued with PRIO "important" (higher retry count)
|
||||
ldi r20, COM_BUFFER_PRIO_IMPORTANT
|
||||
rcall COM_EnqueuePacket ; (R15, R16)
|
||||
brcc CPRO_EnqueueComSendStats_error
|
||||
pop r15
|
||||
out SREG, r15
|
||||
sec
|
||||
ret
|
||||
CPRO_EnqueueComSendStats_error:
|
||||
pop r15
|
||||
out SREG, r15
|
||||
clc
|
||||
ret
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#ifndef BASE_SYSTEM
|
||||
; ---------------------------------------------------------------------------
|
||||
; Enqueue a COM reception stats packet.
|
||||
;
|
||||
; IN:
|
||||
; - R16: destination address
|
||||
; OUT:
|
||||
; - CFLAG: set if okay, clear otherwise
|
||||
; MODIFIED REGS: R16, R17, R20, X (R15, Y)
|
||||
|
||||
CPRO_EnqueueComRecvStats:
|
||||
push r15
|
||||
in r15, SREG
|
||||
cli
|
||||
push r16
|
||||
rcall COM_AllocBufferAndGetXY ; (r16, r17, r21)
|
||||
pop r16
|
||||
brcc CPRO_EnqueueComRecvStats_error
|
||||
|
||||
ldi r17, CPRO_PAYLOAD_FLAGS_UID | (6<<CPRO_PAYLOAD_FLAGS_SHIFT_NUM) ; seconds + 6 bytes payload
|
||||
ldi r18, CPRO_CMD_COMRECVSTATS
|
||||
push xh
|
||||
push xl
|
||||
rcall cproBeginMsgWithVariablePayload ; (R3, R4, R16, R17, R18, R19, R20, R21, X)
|
||||
lds r16, comStatsPacketsIn ; 6: packets in
|
||||
st X+, r16
|
||||
lds r16, comStatsPacketsIn+1
|
||||
st X+, r16
|
||||
lds r16, comStatsRecvErrs ; 8: errors
|
||||
st X+, r16
|
||||
lds r16, comStatsRecvErrs+1
|
||||
st X+, r16
|
||||
lds r16, comStatsHandled ; 10: handled
|
||||
st X+, r16
|
||||
lds r16, comStatsHandled+1
|
||||
st X+, r16
|
||||
pop xl
|
||||
pop xh
|
||||
rcall cproCalcAndAddChecksumByte
|
||||
|
||||
; mark buffer as enqueued with PRIO "important" (higher retry count)
|
||||
ldi r20, COM_BUFFER_PRIO_IMPORTANT
|
||||
rcall COM_EnqueuePacket ; (R15, R16)
|
||||
brcc CPRO_EnqueueComRecvStats_error
|
||||
pop r15
|
||||
out SREG, r15
|
||||
sec
|
||||
ret
|
||||
CPRO_EnqueueComRecvStats_error:
|
||||
pop r15
|
||||
out SREG, r15
|
||||
clc
|
||||
ret
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#ifdef WITH_DEBUG
|
||||
# ifndef BASE_SYSTEM
|
||||
; ---------------------------------------------------------------------------
|
||||
; Enqueue a TWI Bus Member packet.
|
||||
;
|
||||
; IN:
|
||||
; - R16: destination address
|
||||
; - R1 : Address of the bus member
|
||||
; - R2 : availability (0=not available, 1=available)
|
||||
; OUT:
|
||||
; - CFLAG: set if okay, clear otherwise
|
||||
; MODIFIED REGS: R16, R17, R20, X (R15, Y)
|
||||
|
||||
CPRO_EnqueueTwiBusMember:
|
||||
push r16
|
||||
rcall COM_AllocBufferAndGetXY ; (r16, r17, r21)
|
||||
pop r16
|
||||
brcc CPRO_EnqueueTwiBusMember_error
|
||||
clr r17 ; r17: XOR byte
|
||||
; write header (dest address, msg length)
|
||||
st X+, r16 ; destination address
|
||||
eor r17, r16
|
||||
ldi r16, 4 ; 4 bytes payload
|
||||
st X+, r16
|
||||
eor r17, r16
|
||||
; write payload
|
||||
ldi r16, CPRO_CMD_TWIBUSMEMBER ; send command
|
||||
st X+, r16
|
||||
eor r17, r16
|
||||
lds r16, comAddress ; send source address
|
||||
st X+, r16
|
||||
eor r17, r16
|
||||
mov r16, r1 ; send i2c bus member address
|
||||
st X+, r16
|
||||
eor r17, r16
|
||||
mov r16, r2 ; send i2c bus member availability
|
||||
st X+, r16
|
||||
eor r17, r16
|
||||
; store XOR byte
|
||||
st X+, r17
|
||||
; mark buffer as enqueued with PRIO "info" (limited amount of retries)
|
||||
ldi r20, COM_BUFFER_PRIO_INFO
|
||||
rcall COM_EnqueuePacket ; (R15, R16)
|
||||
brcc CPRO_EnqueueTwiBusMember_error
|
||||
sec
|
||||
ret
|
||||
CPRO_EnqueueTwiBusMember_error:
|
||||
clc
|
||||
ret
|
||||
# endif
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#ifdef WITH_DEBUG
|
||||
# ifndef BASE_SYSTEM
|
||||
; ---------------------------------------------------------------------------
|
||||
; Enqueue a DEBUG packet.
|
||||
;
|
||||
; IN:
|
||||
; - R16: destination address
|
||||
; - R1: debug value 1
|
||||
; - R2: debug value 2
|
||||
; OUT:
|
||||
; - CFLAG: set if okay, clear otherwise
|
||||
; MODIFIED REGS: R16, R17, R20, X (R15, Y)
|
||||
|
||||
CPRO_EnqueueDebug:
|
||||
push r16
|
||||
rcall COM_AllocBufferAndGetXY ; (r16, r17, r21)
|
||||
pop r16
|
||||
brcc CPRO_EnqueueDebug_error
|
||||
clr r17 ; r17: XOR byte
|
||||
; write header (dest address, msg length)
|
||||
st X+, r16 ; destination address
|
||||
eor r17, r16
|
||||
ldi r16, 4 ; 2 bytes payload
|
||||
st X+, r16
|
||||
eor r17, r16
|
||||
; write payload
|
||||
ldi r16, CPRO_CMD_DEBUG
|
||||
st X+, r16
|
||||
eor r17, r16
|
||||
lds r16, comAddress
|
||||
st X+, r16
|
||||
eor r17, r16
|
||||
mov r16, r1 ; debug 1
|
||||
st X+, r16
|
||||
eor r17, r16
|
||||
mov r16, r2 ; debug 2
|
||||
st X+, r16
|
||||
eor r17, r16
|
||||
; store XOR byte
|
||||
st X+, r17
|
||||
; mark buffer as enqueued with PRIO "info" (limited amount of retries)
|
||||
ldi r20, COM_BUFFER_PRIO_INFO
|
||||
rcall COM_EnqueuePacket ; (R15, R16)
|
||||
brcc CPRO_EnqueueDebug_error
|
||||
sec
|
||||
ret
|
||||
CPRO_EnqueueDebug_error:
|
||||
clc
|
||||
ret
|
||||
# endif
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#ifndef BASE_SYSTEM
|
||||
; ---------------------------------------------------------------------------
|
||||
; Enqueue a DEVICE packet.
|
||||
;
|
||||
; IN:
|
||||
; - R16: destination address
|
||||
; OUT:
|
||||
; - CFLAG: set if okay, clear otherwise
|
||||
; MODIFIED REGS: R6, R16, R17, R18, R20 (R3, R4, R15, R19, R21, X)
|
||||
|
||||
CPRO_EnqueueDevice:
|
||||
mov r6, r16
|
||||
|
||||
rcall COM_AllocBufferAndGetXY ; (r16, r17, r21)
|
||||
brcc CPRO_EnqueueDevice_error
|
||||
|
||||
push xh
|
||||
push xl
|
||||
mov r16, r6
|
||||
ldi r17, CPRO_PAYLOAD_FLAGS_UID | (6<<CPRO_PAYLOAD_FLAGS_SHIFT_NUM)
|
||||
ldi r18, CPRO_CMD_DEVICE
|
||||
rcall cproBeginMsgWithVariablePayload ; (R3, R4, R16, R17, R18, R19, R20, R21, X)
|
||||
ldi r17, LOW(FW_TYPE)
|
||||
st X+, r17 ; 6: firmware type low
|
||||
ldi r17, HIGH(FW_TYPE)
|
||||
st X+, r17 ; 7: firmware type high
|
||||
ldi r17, FW_MAIN_VERSION_LOW
|
||||
st X+, r17 ; 8: version low
|
||||
ldi r17, FW_MAIN_VERSION_HIGH
|
||||
st X+, r17 ; 9: version high
|
||||
ldi r17, LOW(MODULES_MASK)
|
||||
st X+, r17 ; 10: modules mask low
|
||||
ldi r17, HIGH(MODULES_MASK)
|
||||
st X+, r17 ; 11: modules mask low
|
||||
pop xl
|
||||
pop xh
|
||||
rcall cproCalcAndAddChecksumByte
|
||||
|
||||
; 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_EnqueueDevice_error
|
||||
sec
|
||||
ret
|
||||
CPRO_EnqueueDevice_error:
|
||||
clc
|
||||
ret
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#ifndef BASE_SYSTEM
|
||||
; ---------------------------------------------------------------------------
|
||||
; Enqueue a VALUE packet.
|
||||
;
|
||||
; IN:
|
||||
; - R16: destination address
|
||||
; - R17: value id
|
||||
; - R19:R18: value
|
||||
; - R21:R20: denom (e.g. 100, meaning value must be divided by 100)
|
||||
; - R22: value type
|
||||
; 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_EnqueueValue:
|
||||
mov r6, r16
|
||||
mov r7, r17
|
||||
mov r8, r18
|
||||
mov r9, r19
|
||||
mov r10, r20
|
||||
mov r11, r21
|
||||
mov r12, r22
|
||||
|
||||
rcall COM_AllocBufferAndGetXY ; (r16, r17, r21)
|
||||
brcc CPRO_EnqueueValue_error
|
||||
|
||||
push xh
|
||||
push xl
|
||||
mov r16, r6
|
||||
ldi r17, CPRO_PAYLOAD_FLAGS_UID | (6<<CPRO_PAYLOAD_FLAGS_SHIFT_NUM)
|
||||
ldi r18, CPRO_CMD_VALUE
|
||||
rcall cproBeginMsgWithVariablePayload ; (R3, R4, R16, R17, R18, R19, R20, R21, X)
|
||||
st X+, r7 ; 6: value id
|
||||
st X+, r12 ; 7: value type
|
||||
st X+, r8 ; 8: low value
|
||||
st X+, r9 ; 9: high value
|
||||
st X+, r10 ; 10: low denom
|
||||
st X+, r11 ; 11: high denom
|
||||
pop xl
|
||||
pop xh
|
||||
rcall cproCalcAndAddChecksumByte
|
||||
|
||||
; 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
|
||||
sec
|
||||
ret
|
||||
CPRO_EnqueueValue_error:
|
||||
clc
|
||||
ret
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#ifndef BASE_SYSTEM
|
||||
; ---------------------------------------------------------------------------
|
||||
; Enqueue a NEEDADDRESS packet.
|
||||
;
|
||||
; IN:
|
||||
; - nothing
|
||||
; OUT:
|
||||
; - CFLAG: set if okay, clear otherwise
|
||||
; MODIFIED REGS: R18 (R3, R4, R15, R16, R17, R20, R21, X, Y (R18, R19)
|
||||
|
||||
CPRO_EnqueueNeedAddress:
|
||||
ldi r18, CPRO_CMD_NEED_ADDRESS
|
||||
rjmp cproEnqueueAddressPacket
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#ifndef BASE_SYSTEM
|
||||
; ---------------------------------------------------------------------------
|
||||
; Enqueue a HAVE_ADDRESS packet.
|
||||
;
|
||||
; IN:
|
||||
; - nothing
|
||||
; OUT:
|
||||
; - CFLAG: set if okay, clear otherwise
|
||||
; MODIFIED REGS: R18 (R3, R4, R15, R16, R17, R18, R19, R20, R21, X, Y)
|
||||
|
||||
CPRO_EnqueueHaveAddress:
|
||||
ldi r18, CPRO_CMD_HAVE_ADDRESS
|
||||
lds r19, comAddress
|
||||
rjmp cproEnqueueAddressPacket
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#ifndef BASE_SYSTEM
|
||||
; ---------------------------------------------------------------------------
|
||||
; Enqueue a CLAIM_ADDRESS packet.
|
||||
;
|
||||
; IN:
|
||||
; - R19: claimed address
|
||||
; OUT:
|
||||
; - CFLAG: set if okay, clear otherwise
|
||||
; MODIFIED REGS: R18 (R3, R4, R15, R16, R17, R18, R19, R20, R21, X, Y)
|
||||
|
||||
CPRO_EnqueueClaimAddress:
|
||||
ldi r18, CPRO_CMD_CLAIM_ADDRESS
|
||||
rjmp cproEnqueueAddressPacket
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#ifndef BASE_SYSTEM
|
||||
; ---------------------------------------------------------------------------
|
||||
; Enqueue a DENY_ADDRESS packet.
|
||||
;
|
||||
; IN:
|
||||
; - nothing
|
||||
; OUT:
|
||||
; - CFLAG: set if okay, clear otherwise
|
||||
; MODIFIED REGS: R18, R19 (R3, R4, R15, R16, R17, R20, R21, X, Y)
|
||||
|
||||
CPRO_EnqueueDenyAddress:
|
||||
ldi r18, CPRO_CMD_DENY_ADDRESS
|
||||
lds r19, comAddress
|
||||
rjmp cproEnqueueAddressPacket
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#ifndef BASE_SYSTEM
|
||||
; ---------------------------------------------------------------------------
|
||||
; cproEnqueueAddressPacket
|
||||
; Enqueue a NEED/HAVE/CLAIM ADDRESS packet.
|
||||
;
|
||||
; IN:
|
||||
; - R18: command (either CPRO_CMD_NEED_ADDRESS, CPRO_CMD_HAVE_ADDRESS or CPRO_CMD_CLAIM_ADDRESS)
|
||||
; - R19: address to send (claim, have)
|
||||
; OUT:
|
||||
; - CFLAG: set if okay, clear otherwise
|
||||
; MODIFIED REGS: R16, R17, R20, R21, X, Y (R3, R4, R15, R16, R17, R18, R19, R21, X)
|
||||
|
||||
cproEnqueueAddressPacket:
|
||||
mov r6, r19
|
||||
rcall COM_AllocBufferAndGetXY ; (r16, r17, r21)
|
||||
brcc cproEnqueueAddressPacket_error
|
||||
ldi r16, 0xff
|
||||
ldi r17, CPRO_PAYLOAD_FLAGS_UID | (1<<CPRO_PAYLOAD_FLAGS_SHIFT_NUM)
|
||||
push xh
|
||||
push xl
|
||||
rcall cproBeginMsgWithVariablePayload ; (R3, R4, R16, R17, R18, R19, R20, R21, X)
|
||||
st X+, r6 ; 5: value id
|
||||
pop xl
|
||||
pop xh
|
||||
rcall cproCalcAndAddChecksumByte
|
||||
|
||||
; mark buffer as enqueued with PRIO "important" (higher retry count)
|
||||
ldi r20, COM_BUFFER_PRIO_IMPORTANT
|
||||
rcall COM_EnqueuePacket ; (R15, R16)
|
||||
brcc cproEnqueueAddressPacket_error
|
||||
sec
|
||||
ret
|
||||
cproEnqueueAddressPacket_error:
|
||||
clc
|
||||
ret
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; Enqueue a simple packet with payload only CMD and source address.
|
||||
;
|
||||
@@ -685,7 +244,7 @@ cproEnqueueMsgWithCmdAndSrcAddr:
|
||||
pop r20
|
||||
pop xl
|
||||
pop xh
|
||||
rcall cproCalcAndAddChecksumByte
|
||||
rcall comCalcAndAddChecksumByte
|
||||
|
||||
; mark buffer as enqueued with PRIO given in R20
|
||||
rcall COM_EnqueuePacket ; (R15, R16)
|
||||
@@ -750,31 +309,6 @@ cproBeginMsgWithVariablePayload_l2:
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; add checksum byte to buffer
|
||||
;
|
||||
; IN:
|
||||
; - X : pointer to packet buffer
|
||||
; OUT:
|
||||
; - CFLAG: set if okay, clear otherwise
|
||||
; MODIFIED REGS: R16, R17, R18, X
|
||||
|
||||
cproCalcAndAddChecksumByte:
|
||||
clr r17
|
||||
ld r16, X+ ; dest addr
|
||||
eor r17, r16
|
||||
ld r18, X+ ; msg len
|
||||
eor r17, r18
|
||||
cproCalcAndAddChecksumByte_loop:
|
||||
ld r16, X+
|
||||
eor r17, r16
|
||||
dec r18
|
||||
brne cproCalcAndAddChecksumByte_loop
|
||||
st X+, r17
|
||||
ret
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; cproCalcPayloadSize
|
||||
;
|
||||
|
||||
Reference in New Issue
Block a user