From ae1e4c3e3754fb77232f1b71e41ea758314e2cb4 Mon Sep 17 00:00:00 2001
From: Martin Preuss <martin@aquamaniac.de>
Date: Sun, 20 Jul 2025 00:05:53 +0200
Subject: [PATCH] avr: bootloader works with new com2w code.

---
 avr/devices/n27/boot/boot.asm  |   4 +-
 avr/modules/flash/0BUILD       |   1 +
 avr/modules/flash/io_com2w.asm | 462 +++++++++++++++++++++++++++++++++
 avr/modules/flash/io_stub.asm  |  60 +++++
 4 files changed, 525 insertions(+), 2 deletions(-)
 create mode 100644 avr/modules/flash/io_com2w.asm
 create mode 100644 avr/modules/flash/io_stub.asm

diff --git a/avr/devices/n27/boot/boot.asm b/avr/devices/n27/boot/boot.asm
index 767f207..f867d2b 100644
--- a/avr/devices/n27/boot/boot.asm
+++ b/avr/devices/n27/boot/boot.asm
@@ -26,6 +26,7 @@
 .include "../defs.asm"
 
 .include "common/calls.asm"
+.include "common/utils_io.asm"
 .include "devices/all/defs.asm"
 
 
@@ -122,8 +123,7 @@ main:
 .include "modules/flash/defs.asm"
 .include "modules/flash/eeprom.asm"
 .include "modules/flash/io.asm"
-.include "modules/flash/io_attn.asm"
-.include "modules/flash/io_bitbang.asm"
+.include "modules/flash/io_com2w.asm"
 .include "modules/flash/flash1p.asm"
 .include "modules/flash/flashxp.asm"
 .include "modules/flash/flashprocess.asm"
diff --git a/avr/modules/flash/0BUILD b/avr/modules/flash/0BUILD
index 53f3762..d6e181c 100644
--- a/avr/modules/flash/0BUILD
+++ b/avr/modules/flash/0BUILD
@@ -9,6 +9,7 @@
     flash4p.asm
     flashxp.asm
     flashprocess.asm
+    io_stub.asm
     io.asm
     io_attn.asm
     io_bitbang.asm
diff --git a/avr/modules/flash/io_com2w.asm b/avr/modules/flash/io_com2w.asm
new file mode 100644
index 0000000..1a56014
--- /dev/null
+++ b/avr/modules/flash/io_com2w.asm
@@ -0,0 +1,462 @@
+; ***************************************************************************
+; copyright   : (C) 2025 by Martin Preuss
+; email       : martin@libchipcard.de
+;
+; ***************************************************************************
+; * This file is part of the project "AqHome".                              *
+; * Please see toplevel file COPYING of that project for license details.   *
+; ***************************************************************************
+
+#ifndef AVR_MODULES_FLASH_IO_COM2W_H
+#define AVR_MODULES_FLASH_IO_COM2W_H
+
+
+
+
+.equ COM2W_WAITTIME1 = 30000
+.equ COM2W_WAITTIME2 = 10000
+
+
+
+
+; ***************************************************************************
+; code
+
+.cseg
+
+
+
+; ---------------------------------------------------------------------------
+; @routine ioRawInit
+;
+; Init raw message subsystem.
+;
+
+ioRawInit:
+  ; setup CLK line (as input, disable internal pull-up resistor)
+  cbi COM_CLK_DDR, COM_CLK_PIN           ; set CLK as input
+.ifdef COM_CLK_PUE
+  inr r16, COM_CLK_PUE
+  cbr r16, (1<<COM_CLK_PIN)               ; disable pullup on CLK
+  outr COM_CLK_PUE, r16
+.else
+  cbi COM_CLK_OUTPUT, COM_CLK_PIN        ; disable pullup on CLK
+.endif
+
+  ; setup DATA line (as input, disable internal pull-up resistor)
+  cbi COM_DATA_DDR, COM_DATA_PIN         ; set DATA as input
+.ifdef COM_DATA_PUE
+  inr r16, COM_DATA_PUE
+  cbr r16, (1<<COM_DATA_PIN)              ; disable pullup on DATA
+  outr COM_DATA_PUE, r16
+.else
+  cbi COM_DATA_OUTPUT, COM_DATA_PIN      ; disable pullup on DATA
+.endif
+
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine ioRawSendMsg
+;
+; Send a message
+;
+
+ioRawSendMsg:
+ioRawSendMsg_loop:
+    ldi xl, LOW(flashSendBuffer)
+    ldi xh, HIGH(flashSendBuffer)
+    ldi r19, FLASH_RECVBUFFER_MAXLEN
+    rcall com2wSendMsg
+  brcc ioRawSendMsg_loop
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine ioRawWaitForValidMsg
+;
+; Wait for valid incoming msg
+;
+; @return CFLAG set if okay (packet received), cleared on error
+
+ioRawWaitForValidMsg:
+  ; wait for CLK low
+  ldi r19, 20                             ; wait for up to 10s
+ioRawWaitForValidMsg_waitLowLoop1:
+.ifdef LED_PIN
+    sbi LED_PIN, LED_PINNUM               ; toggle
+.endif
+    ldi r18, 5
+ioRawWaitForValidMsg_waitLowLoop2:
+      ldi r20, 20                         ; wait for about 100us for clock low
+      rcall com2wWaitForClockLowMulti5Us  ; R20, R22
+      brcs ioRawWaitForValidMsg_recvMsg
+      dec r18
+    brne ioRawWaitForValidMsg_waitLowLoop2
+    dec r19
+  brne ioRawWaitForValidMsg_waitLowLoop1
+  clc                                   ; no msg received
+  rjmp ioRawWaitForValidMsg_end
+ioRawWaitForValidMsg_recvMsg:
+  ; receive message
+  ldi xl, LOW(flashRecvBuffer)
+  ldi xh, HIGH(flashRecvBuffer)
+  ldi r18, NET_MAINTENANCE_ADDR
+  ldi r19, FLASH_RECVBUFFER_MAXLEN
+  rcall com2wRecvMsg
+  brcc ioRawWaitForValidMsg_end
+  ; validate CRC
+  ldi xl, LOW(flashRecvBuffer)
+  ldi xh, HIGH(flashRecvBuffer)
+  rcall NETMSG_CheckMessageInBuffer     ; (R16, R17, R18, R19, R20, X)
+ioRawWaitForValidMsg_end:
+  ret
+; @end
+
+
+
+
+
+
+
+
+; ---------------------------------------------------------------------------
+; @routine com2wSendMsg
+;
+; @param X pointer to bytes to send
+; @return CFLAG set if message sent, cleared otherwise
+; @clobbers R18, R20 (R16, R17, R20, R22, X)
+
+com2wSendMsg:
+  ldi r20, 11                           ; wait for about 55us for clock low
+  rcall com2wWaitForClockLowMulti5Us
+  brcs com2wSendMsg_busy                ; CLK got low while waiting, so line is busy
+  rcall com2wClkSetLow                  ; reserve bus (none)
+  adiw xh:xl, NETMSG_OFFS_MSGLEN
+  ld r18, X
+  sbiw xh:xl, NETMSG_OFFS_MSGLEN
+  inc r18                               ; adjust for DESTADDR
+  inc r18                               ; adjust for MSGLEN
+  inc r18                               ; adjust for CRCBYTE
+  rcall com2wWaitTime1                  ; longer wait period (R22)
+  rcall com2wSendBytes                  ; (r16, r17, r18, r22, X)
+  rcall com2wClkSetHigh                 ; make sure bus is released
+  rcall com2wDataSetHigh
+  sec
+  ret
+com2wSendMsg_busy:
+  clc
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine com2wSendBytes
+;
+; @param  R18 number of bytes to send
+; @param X pointer to bytes to send
+; @clobbers: r16, r18, X (r17, r22)
+
+com2wSendBytes:
+com2wSendBytes_loop:
+    rcall com2wClkSetLow                     ; (none)
+    rcall com2wWaitTime1                     ; longer wait period (R22)
+    ld r16, X+
+    rcall com2wSendByte                      ; (R16, R17, R22)
+    dec r18
+  brne com2wSendBytes_loop
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine com2wSendByte
+;
+; @param  R16 byte to send
+; @clobbers: r16, r17 (r22)
+
+com2wSendByte:
+  ldi r17, 8
+com2wSendByte_loop:
+    rcall com2wClkSetLow
+    rcall com2wWaitTime1                        ; longer wait period (R22)
+    lsr r16
+    brcs com2wSendByte_send1
+    rcall com2wDataSetLow
+    rjmp com2wSendByte_sent
+com2wSendByte_send1:
+    rcall com2wDataSetHigh
+com2wSendByte_sent:
+    rcall com2wWaitTime2                        ; shorter wait period (R22)
+    rcall com2wClkSetHigh
+    rcall com2wWaitTime1                        ; longer wait period (R22)
+    dec r17
+  brne com2wSendByte_loop
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine com2wRecvMsg
+;
+; Receive a packet into buffer pointed to by X.
+; Expects interrupts to be disabled.
+;
+; @param R18 COM address to listen to
+; @param R19 max buffer size
+; @param X   buffer to receive to
+; @return CFLAG set if msg received, cleared on error (see R16)
+; @return R16   if CFLAG cleared: 0=message not for this node, otherwise error
+; @clobbers r16, r17, r18, r19, r20, r22, r24, r25, X
+
+com2wRecvMsg:
+  mov r21, r18 ; address
+  ; read destination address
+  rcall com2wRecvByte                    ; (r17, r18, r20, r22)
+  brcc com2wRecvMsg_eIo
+  ; store in buffer
+  subi r19, 1
+  brcs com2wRecvMsg_eBadSize
+  st X+, r16
+  
+  ; read remaining msg size
+  rcall com2wRecvByte                    ; (r17, r18, r20, r22)
+  brcc com2wRecvMsg_eIo
+  ; store in buffer
+  subi r19, 1
+  brcs com2wRecvMsg_eBadSize
+  st X+, r16
+  
+  inc r16                                 ; account for CRC byte
+  sub r19, r16
+  brcs com2wRecvMsg_eBadSize
+  mov r19, r16
+com2wRecvMsg_loop:
+    rcall com2wRecvByte                  ; (r17, r18, r20, r22)
+    brcc com2wRecvMsg_eIo
+    st X+, r16
+    dec r19
+  brne com2wRecvMsg_loop
+  sec
+  rjmp com2wRecvMsg_end
+com2wRecvMsg_eBadSize:
+com2wRecvMsg_eIo:
+com2wRecvMsg_clcRet:
+  clc
+com2wRecvMsg_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine com2wRecvByte
+;
+; @return CFLAG set if byte received, cleared on error
+; @return r16 byte received
+; @clobbers r17, r18, r20, r22
+
+com2wRecvByte:
+  ldi r17, 8
+  clr r16
+com2wRecvByte_loop:
+    ldi r20, 31                          ; wait up to 155us for clock low
+    rcall com2wWaitForClockLowMulti5Us  ; (R20, R22)
+    brcs com2wRecvByte_waitForClkHigh
+    ldi r20, 31                          ; wait up to 155us for clock low
+    rcall com2wWaitForClockLowMulti5Us  ; (R20, R22)
+    brcc com2wRecvByte_end
+com2wRecvByte_waitForClkHigh:
+    ldi r20, 31                          ; wait up to 155us for clock high
+    rcall com2wWaitForClockHighMulti5Us ; (R20, R22)
+    brcs com2wRecvByte_readBit
+    ldi r20, 31                          ; wait up to 155us for clock high
+    rcall com2wWaitForClockHighMulti5Us ; (R20, R22)
+    brcc com2wRecvByte_end
+
+com2wRecvByte_readBit:
+    ; handle received bit
+    inr r18, COM_DATA_INPUT
+    andi r18, (1<<COM_DATA_PIN)
+    clc
+    breq com2wRecvByte_clockData
+    sec
+com2wRecvByte_clockData:
+    ror r16
+    dec r17
+  brne com2wRecvByte_loop
+  sec
+com2wRecvByte_end:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine com2wClkSetHigh
+;
+; @clobbers none
+
+com2wClkSetHigh:
+  cbi COM_CLK_DDR, COM_CLK_PIN           ; set CLK as input
+.ifdef COM_CLK_PUE
+;  cbi COM_CLK_PUE, COM_CLK_PIN           ; disable pullup on CLK
+.else
+  cbi COM_CLK_OUTPUT, COM_CLK_PIN        ; disable pullup on CLK
+.endif
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine com2wClkSetLow
+;
+; @clobbers none
+
+com2wClkSetLow:
+  sbi COM_CLK_DDR, COM_CLK_PIN          ; set CLK as output
+  cbi COM_CLK_OUTPUT, COM_CLK_PIN       ; set CLK low
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine com2wDataSetHigh
+;
+; @clobbers none
+
+com2wDataSetHigh:
+  cbi COM_DATA_DDR, COM_DATA_PIN           ; set DATA as input
+.ifdef COM_DATA_PUE
+;  cbi COM_DATA_PUE, COM_CLK_PIN           ; disable pullup on DATA
+.else
+  cbi COM_DATA_OUTPUT, COM_DATA_PIN        ; disable pullup on DATA
+.endif
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine com2wDataSetLow
+;
+; @clobbers none
+
+com2wDataSetLow:
+  sbi COM_DATA_DDR, COM_DATA_PIN          ; set DATA as output
+  cbi COM_DATA_OUTPUT, COM_DATA_PIN       ; set DATA low
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine com2wWaitForClockHighMulti5Us
+;
+; Wait for high CLK
+;
+; @param  R20 multiple of 5us to wait (e.g. "2" for "10" us, max: 64)
+; @return CFLAG set if okay (state reached), cleared on error
+; @clobbers: r20, r22
+
+com2wWaitForClockHighMulti5Us:
+.if clock == 8000000
+  add r20, r20 ; *2
+  add r20, r20 ; *4
+  add r20, r20 ; *8
+.endif
+.elif clock == 1000000
+; nothing to do
+.else
+  .error "Unhandled clock speed"
+.endif
+
+com2wWaitForClockHighMulti5Us_loop:                   ; 5 cycles per loop
+    sbic COM_CLK_INPUT, COM_CLK_PIN                  ; +2 if skipped, +1 if not
+      rjmp com2wWaitForClockHighMulti5Us_stateReached ; +2
+    dec r20                                            ; +1
+  brne com2wWaitForClockHighMulti5Us_loop             ; +2
+  clc                                                  ; +1
+  ret                                                  ; +4
+com2wWaitForClockHighMulti5Us_stateReached:
+  sec                                                  ; +1
+  ret                                                  ; +4
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine com2wWaitForClockLowMulti5Us
+;
+; Wait for low CLK
+;
+; @param  R20 multiple of 5us to wait (e.g. "2" for "10" us, max: 64)
+; @return CFLAG set if okay (state reached), cleared on error
+; @clobbers: r20, r22
+
+com2wWaitForClockLowMulti5Us:
+.if clock == 8000000
+  add r20, r20 ; *2
+  add r20, r20 ; *4
+  add r20, r20 ; *8
+.endif
+.elif clock == 1000000
+; nothing to do
+.else
+  .error "Unhandled clock speed"
+.endif
+
+com2wWaitForClockLowMulti5Us_loop:                    ; 5 cycles per loop
+    sbis COM_CLK_INPUT, COM_CLK_PIN                  ; +2 if skipped, +1 if not
+      rjmp com2wWaitForClockLowMulti5Us_stateReached  ; +2
+    dec r20                                            ; +1
+  brne com2wWaitForClockLowMulti5Us_loop              ; +2
+  clc                                                  ; +1
+  ret                                                  ; +4
+com2wWaitForClockLowMulti5Us_stateReached:
+  sec                                                  ; +1
+  ret                                                  ; +4
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine com2wWaitTime1
+;
+; waits for longer period (e.g. 30ns)
+;
+; @clobbers R22
+
+com2wWaitTime1:
+  Utils_WaitNanoSecs COM2W_WAITTIME1, 7, r22            ; wait for longer time (minus RCALL and RET)
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine com2wWaitTime2
+;
+; waits for shorter period (e.g. 10ns)
+;
+; @clobbers R22
+
+com2wWaitTime2:
+  Utils_WaitNanoSecs COM2W_WAITTIME2, 7, r22            ; wait for shorter time (minus RCALL and RET)
+  ret
+; @end
+
+
+
+
+#endif ; AVR_MODULES_FLASH_IO_COM2W_H
+
diff --git a/avr/modules/flash/io_stub.asm b/avr/modules/flash/io_stub.asm
new file mode 100644
index 0000000..d0a892c
--- /dev/null
+++ b/avr/modules/flash/io_stub.asm
@@ -0,0 +1,60 @@
+; ***************************************************************************
+; copyright   : (C) 2025 by Martin Preuss
+; email       : martin@libchipcard.de
+;
+; ***************************************************************************
+; * This file is part of the project "AqHome".                              *
+; * Please see toplevel file COPYING of that project for license details.   *
+; ***************************************************************************
+
+
+
+; ***************************************************************************
+; code
+
+.cseg
+
+
+
+; ---------------------------------------------------------------------------
+; @routine ioRawInit
+;
+; Init raw message subsystem.
+;
+
+ioRawInit:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine ioRawSendMsg
+;
+; Send a message
+;
+
+ioRawSendMsg:
+  ret
+; @end
+
+
+
+
+; ---------------------------------------------------------------------------
+; @routine ioRawWaitForValidMsg
+;
+; Wait for valid incoming msg
+;
+; @return CFLAG set if okay (packet received), cleared on error
+
+ioRawWaitForValidMsg:
+  ret
+; @end
+
+
+
+
+
+
+