Moved protocol stuff into comproto.asm.
This commit is contained in:
Martin Preuss
311
avr/com.asm
311
avr/com.asm
@@ -37,13 +37,6 @@
|
||||
.equ COM_MSG_OFFS_MSGLEN = 1
|
||||
.equ COM_MSG_OFFS_MSGDATA = 2
|
||||
|
||||
.equ COM_CMD_PING = 1
|
||||
.equ COM_CMD_COMSENDSTATS = 2
|
||||
.equ COM_CMD_COMRECVSTATS = 3
|
||||
.equ COM_CMD_I2CBUSMEMBER = 4
|
||||
.equ COM_CMD_DEBUG = 5
|
||||
.equ COM_CMD_VALUE = 6
|
||||
|
||||
.equ COM_ERR_NOTFORME = 1
|
||||
.equ COM_ERR_CHECKSUM = 2
|
||||
.equ COM_ERR_IO = 3
|
||||
@@ -230,310 +223,6 @@ COM_AllocBufferAndGetXY_error:
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; Enqueue a PING packet.
|
||||
;
|
||||
; IN:
|
||||
; - R16: destination address
|
||||
; OUT:
|
||||
; - CFLAG: set if okay, clear otherwise
|
||||
; MODIFIED REGS: R16, R17, R20, X (R15, Y)
|
||||
|
||||
COM_EnqueuePing:
|
||||
push r16
|
||||
rcall COM_AllocBufferAndGetXY ; (r16, r17, r21)
|
||||
pop r16
|
||||
brcc COM_EnqueuePing_error
|
||||
clr r17 ; r17: XOR byte
|
||||
; write header (dest address, msg length)
|
||||
st X+, r16 ; destination address
|
||||
eor r17, r16
|
||||
ldi r16, 2 ; 2 bytes payload
|
||||
st X+, r16
|
||||
eor r17, r16
|
||||
; write payload
|
||||
ldi r16, COM_CMD_PING
|
||||
st X+, r16
|
||||
eor r17, r16
|
||||
lds r16, comAddress
|
||||
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 COM_EnqueuePing_error
|
||||
sec
|
||||
ret
|
||||
COM_EnqueuePing_error:
|
||||
clc
|
||||
ret
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; 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)
|
||||
|
||||
COM_EnqueueComSendStats:
|
||||
push r15
|
||||
in r15, SREG
|
||||
cli
|
||||
push r16
|
||||
rcall COM_AllocBufferAndGetXY ; (r16, r17, r21)
|
||||
pop r16
|
||||
brcc COM_EnqueueComSendStats_error
|
||||
clr r17 ; r17: XOR byte
|
||||
; write header (dest address, msg length)
|
||||
st X+, r16 ; destination address
|
||||
eor r17, r16
|
||||
ldi r16, 12 ; 8 bytes payload
|
||||
st X+, r16
|
||||
eor r17, r16
|
||||
; write payload
|
||||
ldi r16, COM_CMD_COMSENDSTATS
|
||||
st X+, r16
|
||||
eor r17, r16
|
||||
lds r16, comAddress
|
||||
st X+, r16
|
||||
eor r17, r16
|
||||
|
||||
lds r16, timerModuleCounterSecs
|
||||
st X+, r16
|
||||
eor r17, r16
|
||||
lds r16, timerModuleCounterSecs+1
|
||||
st X+, r16
|
||||
eor r17, r16
|
||||
lds r16, timerModuleCounterSecs+2
|
||||
st X+, r16
|
||||
eor r17, r16
|
||||
lds r16, timerModuleCounterSecs+3
|
||||
st X+, r16
|
||||
eor r17, r16
|
||||
|
||||
lds r16, comStatsPacketsOut
|
||||
st X+, r16
|
||||
eor r17, r16
|
||||
lds r16, comStatsPacketsOut+1
|
||||
st X+, r16
|
||||
eor r17, r16
|
||||
|
||||
lds r16, comStatsCollisions
|
||||
st X+, r16
|
||||
eor r17, r16
|
||||
lds r16, comStatsCollisions+1
|
||||
st X+, r16
|
||||
eor r17, r16
|
||||
|
||||
lds r16, comStatsAborted
|
||||
st X+, r16
|
||||
eor r17, r16
|
||||
lds r16, comStatsAborted+1
|
||||
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 COM_EnqueueComSendStats_error
|
||||
pop r15
|
||||
out SREG, r15
|
||||
sec
|
||||
ret
|
||||
COM_EnqueueComSendStats_error:
|
||||
pop r15
|
||||
out SREG, r15
|
||||
clc
|
||||
ret
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; Enqueue a I2C 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)
|
||||
|
||||
COM_EnqueueI2cBusMember:
|
||||
push r16
|
||||
rcall COM_AllocBufferAndGetXY ; (r16, r17, r21)
|
||||
pop r16
|
||||
brcc COM_EnqueueI2cBusMember_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, COM_CMD_I2CBUSMEMBER ; 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 COM_EnqueueI2cBusMember_error
|
||||
sec
|
||||
ret
|
||||
COM_EnqueueI2cBusMember_error:
|
||||
clc
|
||||
ret
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; 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)
|
||||
|
||||
COM_EnqueueDebug:
|
||||
push r16
|
||||
rcall COM_AllocBufferAndGetXY ; (r16, r17, r21)
|
||||
pop r16
|
||||
brcc COM_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, COM_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 COM_EnqueueDebug_error
|
||||
sec
|
||||
ret
|
||||
COM_EnqueueDebug_error:
|
||||
clc
|
||||
ret
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; 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:
|
||||
|
||||
COM_EnqueueValue:
|
||||
push r16
|
||||
push r17
|
||||
push r21
|
||||
rcall COM_AllocBufferAndGetXY ; (r16, r17, r21)
|
||||
pop r21
|
||||
pop r17
|
||||
pop r16
|
||||
brcc COM_EnqueueValue_error
|
||||
clr r1 ; r1: XOR byte
|
||||
; write header (dest address, msg length)
|
||||
st X+, r16 ; destination address
|
||||
eor r1, r16
|
||||
ldi r16, 12 ; 12 bytes payload
|
||||
st X+, r16 ; msglen
|
||||
eor r1, r16
|
||||
; write payload
|
||||
ldi r16, COM_CMD_VALUE ; 0: msg type
|
||||
st X+, r16
|
||||
eor r1, r16
|
||||
lds r16, comAddress ; 1: source address
|
||||
st X+, r16
|
||||
eor r1, r16
|
||||
lds r16, timerModuleCounterSecs ; 2-5: current seconds counter
|
||||
st X+, r16
|
||||
eor r1, r16
|
||||
lds r16, timerModuleCounterSecs+1
|
||||
st X+, r16
|
||||
eor r1, r16
|
||||
lds r16, timerModuleCounterSecs+2
|
||||
st X+, r16
|
||||
eor r1, r16
|
||||
lds r16, timerModuleCounterSecs+3
|
||||
st X+, r16
|
||||
eor r1, r16
|
||||
st X+, r17 ; 6: value id
|
||||
eor r1, r17
|
||||
st X+, r22 ; 7: value type
|
||||
eor r1, r22
|
||||
st X+, r18 ; 8: low value
|
||||
eor r1, r18
|
||||
st X+, r19 ; 9: high value
|
||||
eor r1, r19
|
||||
st X+, r20 ; 10: low denom
|
||||
eor r1, r20
|
||||
st X+, r21 ; 11: high denom
|
||||
eor r1, r21
|
||||
; store XOR byte
|
||||
mov r16, r1
|
||||
st X+, r16
|
||||
; mark buffer as enqueued with PRIO "normal" (slightly limited number of retries)
|
||||
ldi r20, COM_BUFFER_PRIO_NORMAL
|
||||
rcall COM_EnqueuePacket ; (R15, R16)
|
||||
brcc COM_EnqueueValue_error
|
||||
sec
|
||||
ret
|
||||
COM_EnqueueValue_error:
|
||||
clc
|
||||
ret
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
; ---------------------------------------------------------------------------
|
||||
; comHandleNextPacketInQueue
|
||||
;
|
||||
|
||||
Reference in New Issue
Block a user