From 27a0214b5dc4925314e9f07379ff6d084624aab2 Mon Sep 17 00:00:00 2001 From: Martin Preuss Date: Sat, 17 May 2025 13:16:46 +0200 Subject: [PATCH] removed old COM2 parts from code. --- avr/modules/flash/flashprocess.asm | 2 +- avr/modules/flash/io.asm | 6 +++--- avr/modules/network/msg/defs.asm | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/avr/modules/flash/flashprocess.asm b/avr/modules/flash/flashprocess.asm index dfc11a5..f6ca81e 100644 --- a/avr/modules/flash/flashprocess.asm +++ b/avr/modules/flash/flashprocess.asm @@ -277,7 +277,7 @@ flashProcessWriteFlashReady: st X+, r16 ; msg len ldi r16, NETMSG_CMD_FLASH_READY st X+, r16 ; msg code - ldi r16, COM2_MAINTENANCE_ADDR + ldi r16, NET_MAINTENANCE_ADDR st X+, r16 ; src address ; payload diff --git a/avr/modules/flash/io.asm b/avr/modules/flash/io.asm index 47b0428..54d59f3 100644 --- a/avr/modules/flash/io.asm +++ b/avr/modules/flash/io.asm @@ -35,12 +35,12 @@ ioWaitForGivenMsg_loop: brcc ioWaitForGivenMsg_loopEnd ldi xl, LOW(flashRecvBuffer) ldi xh, HIGH(flashRecvBuffer) - adiw xh:xl, COM2_MSG_OFFS_CMD + adiw xh:xl, NETMSG_OFFS_CMD ld r16, X - sbiw xh:xl, COM2_MSG_OFFS_CMD + sbiw xh:xl, NETMSG_OFFS_CMD cp r16, r17 breq ioWaitForGivenMsg_gotIt - cpi r16, CPRO_CMD_FLASH_END + cpi r16, NETMSG_CMD_FLASH_END breq ioWaitForGivenMsg_gotIt ioWaitForGivenMsg_loopEnd: mov r16, r17 ; move expected code back to r16 diff --git a/avr/modules/network/msg/defs.asm b/avr/modules/network/msg/defs.asm index 89d978e..e5b8c3d 100644 --- a/avr/modules/network/msg/defs.asm +++ b/avr/modules/network/msg/defs.asm @@ -63,6 +63,10 @@ +; --------------------------------------------------------------------------- +; special addresses + +.equ NET_MAINTENANCE_ADDR = 0xc1