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

avr: more ringbuffer macros and code.

Browse Source
This commit is contained in:
Martin Preuss
2025-01-16 17:04:18 +01:00
parent fff64ae41e
commit 87706e1265
4 changed files with 245 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
avr/common/m_ringbuffer.asm
View File

@@ -10,38 +10,36 @@
; ---------------------------------------------------------------------------
; @macro m_ringbuffer_y_writebyte
; @macro m_ringbuffer_writebyte
;
; @param R16 byte to write
; @param Y base address (for "LDD Y+nn" and "STD Y+nn")
; @param %0 constant maxBytes
; @param %1 offset to Y to access usedBytes variable (for "LDD Y+nn" and "STD Y+nn")
; @param %2 offset to Y to access readPos variable
; @param %3 offset to Y to access writePos variable
; @param %4 offset to Y to access buffer
; @param %1 address of usedBytes variable
; @param %2 address of readPos variable
; @param %3 address of writePos variable
; @param %4 address of buffer
; @return CFLAG set if okay, cleared on error (i.e. buffer full)
; @clobbers R17, X
.macro m_ringbuffer_y_writebyte
ldd r17, Y+@1 ; usedBytes
cpi r17, @0 ; maxBytes
.macro m_ringbuffer_writebyte
ld r17, @1 ; usedBytes
cpi r17, @0 ; maxBytes
brcc l_end
inc r17
std Y+@1, r17 ; usedBytes
ldd r17, Y+@3 ; writePos
mov xl, yl
mov xh, yh
adiw xh:xl, @4
st @1, r17 ; usedBytes
ld r17, @3 ; writePos
ldi xl, LOW(@4) ; buffer start
ldi xh, HIGH(@4)
add xl, r17
adc xh, r17
sub xh, r17
st X, r16
inc r17
cpi r17, @0
cpi r17, @0 ; maxBytes
brcs l_store
clr r17
l_store:
std Y+@3, r17 ; writePos
st @3, r17 ; writePos
sec
l_end:
.endmacro
@@ -50,29 +48,27 @@ l_end:
; ---------------------------------------------------------------------------
; @macro m_ringbuffer_y_readbyte
; @macro m_ringbuffer_readbyte
;
; @param Y base address (for "LDD Y+nn" and "STD Y+nn")
; @param %0 constant maxBytes
; @param %1 offset to Y to access usedBytes variable (for "LDD Y+nn" and "STD Y+nn")
; @param %2 offset to Y to access readPos variable
; @param %3 offset to Y to access writePos variable
; @param %4 offset to Y to access buffer
; @param %1 address of usedBytes variable
; @param %2 address of readPos variable
; @param %3 address of writePos variable
; @param %4 address of buffer
; @return CFLAG set if okay, cleared on error (i.e. buffer full)
; @return R16 byte read
; @clobbers R17, X
.macro m_ringbuffer_y_readbyte
ldd r17, Y+@1 ; usedBytes
.macro m_ringbuffer_readbyte
ld r17, @1 ; usedBytes
tst r17
clc
breq l_end
dec r17
std Y+@1, r17 ; usedBytes
ldd r17, Y+@2 ; readPos
mov xl, yl
mov xh, yh
adiw xh:xl, @4
st @1, r17 ; usedBytes
ld r17, @2 ; readPos
ldi xl, LOW(@4) ; buffer start
ldi xh, HIGH(@4)
add xl, r17
adc xh, r17
sub xh, r17
@@ -82,7 +78,7 @@ l_end:
brcs l_store
clr r17
l_store:
std Y+@2, r17 ; readPos
st @2, r17 ; readPos
sec
l_end:
.endmacro
@@ -90,21 +86,20 @@ l_end:
; ---------------------------------------------------------------------------
; @macro m_ringbuffer_y_reset
; @macro m_ringbuffer_reset
;
; @param Y base address (for "LDD Y+nn" and "STD Y+nn")
; @param %0 constant maxBytes
; @param %1 offset to Y to access usedBytes variable (for "LDD Y+nn" and "STD Y+nn")
; @param %2 offset to Y to access readPos variable
; @param %3 offset to Y to access writePos variable
; @param %4 offset to Y to access buffer
; @param %1 address of usedBytes variable
; @param %2 address of readPos variable
; @param %3 address of writePos variable
; @param %4 address of buffer
; @clobbers R17
.macro m_ringbuffer_y_reset
.macro m_ringbuffer_reset
clr r17
std Y+@1, r17 ; usedBytes
std Y+@2, r17 ; readPos
std Y+@3, r17 ; writePos
st @1, r17 ; usedBytes
st @2, r17 ; readPos
st @3, r17 ; writePos
l_end:
.endmacro
; @end