From 817ff958b99dff21ed03c00f29b75e0c09e38ea1 Mon Sep 17 00:00:00 2001
From: Martin Preuss <martin@aquamaniac.de>
Date: Thu, 5 Sep 2024 03:18:22 +0200
Subject: [PATCH] avr: use common code.

---
 avr/modules/comproto/msg_device.asm    | 34 ++++++++----------
 avr/modules/comproto/msg_recvstats.asm | 36 ++++++-------------
 avr/modules/flash/flash_ready.asm      | 50 ++++++++++++--------------
 3 files changed, 46 insertions(+), 74 deletions(-)

diff --git a/avr/modules/comproto/msg_device.asm b/avr/modules/comproto/msg_device.asm
index 5d905d3..31a6fe7 100644
--- a/avr/modules/comproto/msg_device.asm
+++ b/avr/modules/comproto/msg_device.asm
@@ -21,32 +21,26 @@
 ;
 ; IN:
 ; - R16: destination address
-; - X  : buffer to write to
 ; OUT:
 ; - nothing
 ; REGS: R3, R4, R16, R17, R18, X (R19, R20, R21)
 
 CPRO_WriteDevice:
-  ldi r17, COM2_PAYLOAD_FLAGS_UID | (6<<COM2_PAYLOAD_FLAGS_SHIFT_NUM)
+  ldi r17, COM2_PAYLOAD_FLAGS_UID | (8<<COM2_PAYLOAD_FLAGS_SHIFT_NUM)
   ldi r18, CPRO_CMD_DEVICE
-  push xh
-    push xl
-      rcall COM2_BeginMsgWithVariablePayload    ; (R3, R4, R16, R17, R18, R19, R20, R21, X)
-      lds r17, firmwareType
-      st X+, r17                             ; 6: firmware type low
-      lds r17, firmwareType+1
-      st X+, r17                             ; 7: firmware type high
-      lds r17, firmwareVersion
-      st X+, r17                             ; 8: version low
-      lds r17, firmwareVersion+1
-      st X+, r17                             ; 9: version high
-      lds r17, firmwareModules
-      st X+, r17                             ; 10: modules mask low
-      lds r17, firmwareModules+1
-      st X+, r17                             ; 11: modules mask low
-    pop xl
-  pop xh
-  rcall com2CalcAndAddChecksumByte             ; (R16, R17, R18, R19, X)
+  rcall COM2_BeginMsgWithVariablePayload    ; (R3, R4, R16, R17, R18, R19, R20, R21, X)
+  push yh
+    push yl
+      ldi zh, HIGH(devInfoBlock*2)          ; 6-13: devInfoBlock
+      ldi zl, LOW(devInfoBlock*2)
+      ldi r18, 8
+      rcall Utils_CopyFromFlash             ; (R17, R18, X, Y)
+    pop yl
+  pop yh
+
+  sbiw xh:xl, 16 ; go back to beginning of message (1 byte dst addr, 1 byte length, 14 bytes payload)
+  rcall com2CalcAndAddChecksumByte           ; (R16, R17, R18, R19, R20, X)
+  sbiw xh:xl, 17 ; go back to beginning of message (1 byte dst addr, 1 byte length, 14 bytes payload, 1 byte crc)
   ret
 
 
diff --git a/avr/modules/comproto/msg_recvstats.asm b/avr/modules/comproto/msg_recvstats.asm
index 81dccfa..24e0762 100644
--- a/avr/modules/comproto/msg_recvstats.asm
+++ b/avr/modules/comproto/msg_recvstats.asm
@@ -27,35 +27,19 @@
 ; REGS: R3, R4, R16, R17, R18, X (R19, R20, R21)
 
 CPRO_WriteComRecvStats:
-  ldi r17, COM2_PAYLOAD_FLAGS_UID | (12<<COM2_PAYLOAD_FLAGS_SHIFT_NUM) ; seconds + 12 bytes payload
+  ldi r17, COM2_PAYLOAD_FLAGS_UID | ((com2RecvStatsEnd-com2RecvStatsBegin)<<COM2_PAYLOAD_FLAGS_SHIFT_NUM) ; uid + payload
   ldi r18, CPRO_CMD_COMRECVSTATS
   push xh
     push xl
-      rcall COM2_BeginMsgWithVariablePayload    ; (R3, R4, R16, R17, R18, R19, R20, R21, X)
-      lds r16, com2StatsPacketsIn               ; packets in
-      st X+, r16                             
-      lds r16, com2StatsPacketsIn+1
-      st X+, r16
-      lds r16, com2StatsContentError            ; CRC errors
-      st X+, r16
-      lds r16, com2StatsContentError+1
-      st X+, r16
-      lds r16, com2StatsIoError                 ; IO errors
-      st X+, r16
-      lds r16, com2StatsIoError+1
-      st X+, r16
-      lds r16, com2StatsNoBufferError           ; no buffer
-      st X+, r16
-      lds r16, com2StatsNoBufferError+1
-      st X+, r16
-      lds r16, com2StatsHandled
-      st X+, r16
-      lds r16, com2StatsHandled+1
-      st X+, r16
-      lds r16, com2StatsMissed
-      st X+, r16
-      lds r16, com2StatsMissed+1
-      st X+, r16
+      rcall COM2_BeginMsgWithVariablePayload           ; (R3, R4, R16, R17, R18, R19, R20, R21, X)
+      push yh
+        push yl
+          ldi yh, HIGH(com2RecvStatsBegin)
+          ldi yl, LOW(com2RecvStatsBegin)
+          ldi r18, com2RecvStatsEnd-com2RecvStatsBegin
+          rcall Utils_Copy_SDRAM                       ; (R17, R18, X, Y)
+        pop yl
+      pop yh
     pop xl
   pop xh
   rcall com2CalcAndAddChecksumByte             ; (R16, R17, R18, R19, X)
diff --git a/avr/modules/flash/flash_ready.asm b/avr/modules/flash/flash_ready.asm
index b967495..fd20949 100644
--- a/avr/modules/flash/flash_ready.asm
+++ b/avr/modules/flash/flash_ready.asm
@@ -24,43 +24,37 @@
 ; - X  : buffer to write to
 ; OUT:
 ; - nothing
-; MODIFIED REGS: R16, Z (R17, R18, R19, R20)
+; MODIFIED REGS: R16, R18, Y, Z (R17, R19, R20)
 
 flashWriteFlashReady:
   ldi r16, 0xff
-  st X+, r16 ; dest address (unused)
-  ldi r16, 12 ; msg code+src address+ten payload bytes
-  st X+, r16 ; msg len
+  st X+, r16  ; dest address (unused)
+  ldi r16, 16 ; msg code+src address+14 payload bytes
+  st X+, r16  ; msg len
   ldi r16, CPRO_CMD_FLASH_READY
-  st X+, r16 ; msg code
+  st X+, r16  ; msg code
   ldi r16, COM2_MAINTENANCE_ADDR
-  st X+, r16 ; src address (not used)
+  st X+, r16 ; src address
+
   ; payload
-  lds r16, flashUid
-  st X+, r16
-  lds r16, flashUid+1
-  st X+, r16
-  lds r16, flashUid+2
-  st X+, r16
-  lds r16, flashUid+3
-  st X+, r16
-  ldi zl, low(firmwareType*2)
-  ldi zh, HIGH(firmwareType*2)
-  lpm r16, Z+
-  st X+, r16     ; firmwareType (low)
-  lpm r16, Z+
-  st X+, r16     ; firmwareType (high)
-  lpm r16, Z+ 
-  st X+, r16     ; firmwareVersion (low)
-  lpm r16, Z+ 
-  st X+, r16     ; firmwareVersion (high)
-  ldi r16, LOW(PAGESIZE*2)
+  ldi yh, HIGH(flashUid) ; 4 bytes
+  ldi yl, LOW(flashUid)
+  ldi r18, 4
+  rcall Utils_Copy_SDRAM
+  
+  ldi zl, low(devInfoBlock*2) ; 8 bytes
+  ldi zh, HIGH(devInfoBlock*2)
+  ldi r18, 8
+  rcall Utils_CopyFromFlash
+
+  ldi r16, LOW(PAGESIZE*2)   ; 2 bytes
   st X+, r16
   ldi r16, HIGH(PAGESIZE*2)
-  st X, r16
-  sbiw xh:xl, 13
+  st X+, r16
+  
+  sbiw xh:xl, 18 ; go back to beginning of message
   rcall com2CalcAndAddChecksumByte ; (R16, R17, R18, R19, R20, X)
-  sbiw xh:xl, 14
+  sbiw xh:xl, 19 ; go back to beginning of message
   ret