avr: use common code.

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