From 65e60c2decbba01bff1386d78558df076703398c Mon Sep 17 00:00:00 2001
From: Martin Preuss <martin@aquamaniac.de>
Date: Sun, 1 Sep 2024 20:06:05 +0200
Subject: [PATCH] Replace multiple wait macros with calls (saves 10 bytes).

---
 avr/modules/com2/lowlevel.asm | 18 ++++++++++++++++--
 avr/modules/com2/packets.asm  | 18 ++++++++++++++++--
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/avr/modules/com2/lowlevel.asm b/avr/modules/com2/lowlevel.asm
index 3a394c7..f4e6031 100644
--- a/avr/modules/com2/lowlevel.asm
+++ b/avr/modules/com2/lowlevel.asm
@@ -167,7 +167,7 @@ com2WaitForDataState1ms_loop:
     eor r22, r16
     andi r22, (1<<COM_PINNUM_DATA)
     breq com2WaitForDataState1ms_stateReached
-    Utils_WaitNanoSecs 10000, 0, r22              ; wait for 10us
+    rcall com2WaitFor10MicroSecs                  ; wait for 10us (R22)
     dec r17
   brne com2WaitForDataState1ms_loop
   clc
@@ -195,7 +195,7 @@ com2WaitForAttnState1ms_loop:
     eor r22, r16
     andi r22, (1<<COM_PINNUM_ATTN)
     breq com2WaitForAttnState1ms_stateReached
-    Utils_WaitNanoSecs 10000, 0, r22              ; wait for 10us
+    rcall com2WaitFor10MicroSecs                  ; wait for 10us (R22)
     dec r17
   brne com2WaitForAttnState1ms_loop
   clc
@@ -206,3 +206,17 @@ com2WaitForAttnState1ms_stateReached:
 
 
 
+; ---------------------------------------------------------------------------
+; wait for 10 microsecs (minus cycles for call and ret).
+;
+; IN:
+; - nothing
+; OUT:
+; - nothing
+; REGS: r22
+
+com2WaitFor10MicroSecs:
+    Utils_WaitNanoSecs 10000, 3+4, r22            ; wait for 10us (minus RCALL and RET)
+    ret
+
+
diff --git a/avr/modules/com2/packets.asm b/avr/modules/com2/packets.asm
index 15473a3..1f1f64e 100644
--- a/avr/modules/com2/packets.asm
+++ b/avr/modules/com2/packets.asm
@@ -80,7 +80,7 @@ COM2_SendPacketWithAttn:
   push r15
     in r15, SREG
     cli
-    Utils_WaitNanoSecs COM_BIT_LENGTH, 0, r22      ; wait for one bit duration
+    rcall com2WaitForOneBitLength                  ; wait for one bit duration (R22)
     ; check for ATTN line: busy?
     cbi COM_PORT_ATTN, COM_PINNUM_ATTN             ; disable pullup on ATTN
     cbi COM_DDR_ATTN, COM_PINNUM_ATTN              ; set ATTN as input
@@ -90,7 +90,7 @@ COM2_SendPacketWithAttn:
   
     cbi COM_PORT_ATTN, COM_PINNUM_ATTN             ; set ATTN low
     sbi COM_DDR_ATTN, COM_PINNUM_ATTN              ; set ATTN as output
-    Utils_WaitNanoSecs COM_BIT_LENGTH, 0, r22      ; wait for one bit duration
+    rcall com2WaitForOneBitLength                    ; wait for one bit duration (R22)
 
     adiw xh:xl, COM2_MSG_OFFS_MSGLEN
     ld r16, X
@@ -122,6 +122,20 @@ COM2_SendPacketWithAttn_retNc:
 
 
 
+; ---------------------------------------------------------------------------
+; wait for one bit length (minus cycles for call and ret).
+;
+; IN:
+; - nothing
+; OUT:
+; - nothing
+; REGS: r22
+
+com2WaitForOneBitLength:
+    Utils_WaitNanoSecs COM_BIT_LENGTH, 3+4, r22      ; wait for one bit duration (minus RCALL/RET)
+    ret
+
+
 ; ---------------------------------------------------------------------------
 ; send packet over wire, expects ATTN to be low.
 ;