From aee2c384c81ff3450b061590d2a3d0e6dd1ac460 Mon Sep 17 00:00:00 2001 From: Martin Preuss Date: Tue, 25 Mar 2025 00:37:12 +0100 Subject: [PATCH] avr: fixed includes. --- avr/devices/n06/n06_boot.asm | 6 ++---- avr/devices/n11/n11_boot.asm | 6 ++---- avr/devices/n12/n12_boot.asm | 6 ++---- avr/devices/n14/n14_boot.asm | 6 ++---- avr/devices/n15/n15_boot.asm | 6 ++---- avr/devices/n16/n16_boot.asm | 6 ++---- avr/devices/n17/n17_boot.asm | 6 ++---- avr/devices/n18/boot.asm | 6 ++---- avr/devices/n19/boot.asm | 6 ++---- avr/devices/n20/boot.asm | 10 +++++----- avr/devices/n21/boot.asm | 7 ++----- avr/devices/n22/boot.asm | 6 ++---- avr/devices/n23/boot.asm | 6 ++---- avr/devices/t03/boot.asm | 4 ++-- 14 files changed, 31 insertions(+), 56 deletions(-) diff --git a/avr/devices/n06/n06_boot.asm b/avr/devices/n06/n06_boot.asm index 437274b..cf83e97 100644 --- a/avr/devices/n06/n06_boot.asm +++ b/avr/devices/n06/n06_boot.asm @@ -104,10 +104,6 @@ main: ; *************************************************************************** ; includes -.include "modules/uart_bitbang/bytelevel.asm" -.include "modules/uart_bitbang/packetlevel.asm" -.include "modules/com2/crc.asm" -.include "common/crc8.asm" .include "common/utils_wait_fixed.asm" .include "common/utils_copy_from_flash.asm" .include "common/utils_copy_sdram.asm" @@ -121,6 +117,8 @@ main: .include "modules/flash/flashprocess.asm" .include "modules/flash/wait.asm" .include "modules/bootloader/main.asm" +.include "modules/network/msg/defs.asm" +.include "modules/network/msg/crc.asm" diff --git a/avr/devices/n11/n11_boot.asm b/avr/devices/n11/n11_boot.asm index 615e47f..5db7a4d 100644 --- a/avr/devices/n11/n11_boot.asm +++ b/avr/devices/n11/n11_boot.asm @@ -104,10 +104,6 @@ main: ; *************************************************************************** ; includes -.include "modules/uart_bitbang/bytelevel.asm" -.include "modules/uart_bitbang/packetlevel.asm" -.include "modules/com2/crc.asm" -.include "common/crc8.asm" .include "common/utils_wait_fixed.asm" .include "common/utils_copy_from_flash.asm" .include "common/utils_copy_sdram.asm" @@ -121,6 +117,8 @@ main: .include "modules/flash/flashprocess.asm" .include "modules/flash/wait.asm" .include "modules/bootloader/main.asm" +.include "modules/network/msg/defs.asm" +.include "modules/network/msg/crc.asm" diff --git a/avr/devices/n12/n12_boot.asm b/avr/devices/n12/n12_boot.asm index 03b415c..58f20d8 100644 --- a/avr/devices/n12/n12_boot.asm +++ b/avr/devices/n12/n12_boot.asm @@ -105,10 +105,6 @@ main: ; *************************************************************************** ; includes -.include "modules/uart_bitbang/bytelevel.asm" -.include "modules/uart_bitbang/packetlevel.asm" -.include "modules/com2/crc.asm" -.include "common/crc8.asm" .include "common/utils_wait_fixed.asm" .include "common/utils_copy_from_flash.asm" .include "common/utils_copy_sdram.asm" @@ -122,6 +118,8 @@ main: .include "modules/flash/flashprocess.asm" .include "modules/flash/wait.asm" .include "modules/bootloader/main.asm" +.include "modules/network/msg/defs.asm" +.include "modules/network/msg/crc.asm" diff --git a/avr/devices/n14/n14_boot.asm b/avr/devices/n14/n14_boot.asm index 91ba42f..fe7d310 100644 --- a/avr/devices/n14/n14_boot.asm +++ b/avr/devices/n14/n14_boot.asm @@ -103,10 +103,6 @@ main: ; *************************************************************************** ; includes -;.include "modules/uart_bitbang/bytelevel.asm" -;.include "modules/uart_bitbang/packetlevel.asm" -.include "modules/com2/crc.asm" -.include "common/crc8.asm" .include "common/utils_wait_fixed.asm" .include "common/utils_copy_from_flash.asm" .include "common/utils_copy_sdram.asm" @@ -120,6 +116,8 @@ main: .include "modules/flash/flashprocess.asm" .include "modules/flash/wait.asm" .include "modules/bootloader/main.asm" +.include "modules/network/msg/defs.asm" +.include "modules/network/msg/crc.asm" diff --git a/avr/devices/n15/n15_boot.asm b/avr/devices/n15/n15_boot.asm index ab5ed51..b64771d 100644 --- a/avr/devices/n15/n15_boot.asm +++ b/avr/devices/n15/n15_boot.asm @@ -104,10 +104,6 @@ main: ; *************************************************************************** ; includes -.include "modules/uart_bitbang/bytelevel.asm" -.include "modules/uart_bitbang/packetlevel.asm" -.include "modules/com2/crc.asm" -.include "common/crc8.asm" .include "common/utils_wait_fixed.asm" .include "common/utils_copy_from_flash.asm" .include "common/utils_copy_sdram.asm" @@ -121,6 +117,8 @@ main: .include "modules/flash/flashprocess.asm" .include "modules/flash/wait.asm" .include "modules/bootloader/main.asm" +.include "modules/network/msg/defs.asm" +.include "modules/network/msg/crc.asm" diff --git a/avr/devices/n16/n16_boot.asm b/avr/devices/n16/n16_boot.asm index 422fb3c..e3b7ec9 100644 --- a/avr/devices/n16/n16_boot.asm +++ b/avr/devices/n16/n16_boot.asm @@ -104,10 +104,6 @@ main: ; *************************************************************************** ; includes -.include "modules/uart_bitbang/bytelevel.asm" -.include "modules/uart_bitbang/packetlevel.asm" -.include "modules/com2/crc.asm" -.include "common/crc8.asm" .include "common/utils_wait_fixed.asm" .include "common/utils_copy_from_flash.asm" .include "common/utils_copy_sdram.asm" @@ -121,6 +117,8 @@ main: .include "modules/flash/flashprocess.asm" .include "modules/flash/wait.asm" .include "modules/bootloader/main.asm" +.include "modules/network/msg/defs.asm" +.include "modules/network/msg/crc.asm" diff --git a/avr/devices/n17/n17_boot.asm b/avr/devices/n17/n17_boot.asm index 09a6b61..3730141 100644 --- a/avr/devices/n17/n17_boot.asm +++ b/avr/devices/n17/n17_boot.asm @@ -104,10 +104,6 @@ main: ; *************************************************************************** ; includes -.include "modules/uart_bitbang/bytelevel.asm" -.include "modules/uart_bitbang/packetlevel.asm" -.include "modules/com2/crc.asm" -.include "common/crc8.asm" .include "common/utils_wait_fixed.asm" .include "common/utils_copy_from_flash.asm" .include "common/utils_copy_sdram.asm" @@ -121,6 +117,8 @@ main: .include "modules/flash/flashprocess.asm" .include "modules/flash/wait.asm" .include "modules/bootloader/main.asm" +.include "modules/network/msg/defs.asm" +.include "modules/network/msg/crc.asm" diff --git a/avr/devices/n18/boot.asm b/avr/devices/n18/boot.asm index f2d9545..d201486 100644 --- a/avr/devices/n18/boot.asm +++ b/avr/devices/n18/boot.asm @@ -101,10 +101,6 @@ main: ; *************************************************************************** ; includes -.include "modules/uart_bitbang/bytelevel.asm" -.include "modules/uart_bitbang/packetlevel.asm" -.include "modules/com2/crc.asm" -.include "common/crc8.asm" .include "common/utils_wait_fixed.asm" .include "common/utils_copy_from_flash.asm" .include "common/utils_copy_sdram.asm" @@ -118,6 +114,8 @@ main: .include "modules/flash/flashprocess.asm" .include "modules/flash/wait.asm" .include "modules/bootloader/main.asm" +.include "modules/network/msg/defs.asm" +.include "modules/network/msg/crc.asm" diff --git a/avr/devices/n19/boot.asm b/avr/devices/n19/boot.asm index f2d9545..d201486 100644 --- a/avr/devices/n19/boot.asm +++ b/avr/devices/n19/boot.asm @@ -101,10 +101,6 @@ main: ; *************************************************************************** ; includes -.include "modules/uart_bitbang/bytelevel.asm" -.include "modules/uart_bitbang/packetlevel.asm" -.include "modules/com2/crc.asm" -.include "common/crc8.asm" .include "common/utils_wait_fixed.asm" .include "common/utils_copy_from_flash.asm" .include "common/utils_copy_sdram.asm" @@ -118,6 +114,8 @@ main: .include "modules/flash/flashprocess.asm" .include "modules/flash/wait.asm" .include "modules/bootloader/main.asm" +.include "modules/network/msg/defs.asm" +.include "modules/network/msg/crc.asm" diff --git a/avr/devices/n20/boot.asm b/avr/devices/n20/boot.asm index c7a85e8..4e59cfc 100644 --- a/avr/devices/n20/boot.asm +++ b/avr/devices/n20/boot.asm @@ -103,22 +103,22 @@ main: ; *************************************************************************** ; includes -.include "modules/uart_bitbang/bytelevel.asm" -.include "modules/uart_bitbang/packetlevel.asm" -.include "modules/com2/crc.asm" -.include "common/crc8.asm" .include "common/utils_wait_fixed.asm" .include "common/utils_copy_from_flash.asm" .include "common/utils_copy_sdram.asm" .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/flash.asm" +.include "modules/flash/flash1p.asm" .include "modules/flash/flashprocess.asm" .include "modules/flash/wait.asm" .include "modules/bootloader/main.asm" +.include "modules/network/msg/defs.asm" +.include "modules/network/msg/crc.asm" + diff --git a/avr/devices/n21/boot.asm b/avr/devices/n21/boot.asm index b0cdc35..b2cfa0d 100644 --- a/avr/devices/n21/boot.asm +++ b/avr/devices/n21/boot.asm @@ -104,10 +104,6 @@ main: ; *************************************************************************** ; includes -.include "modules/uart_bitbang/bytelevel.asm" -.include "modules/uart_bitbang/packetlevel.asm" -.include "modules/com2/crc.asm" -.include "common/crc8.asm" .include "common/utils_wait_fixed.asm" .include "common/utils_copy_from_flash.asm" .include "common/utils_copy_sdram.asm" @@ -121,7 +117,8 @@ main: .include "modules/flash/flashprocess.asm" .include "modules/flash/wait.asm" .include "modules/bootloader/main.asm" - +.include "modules/network/msg/defs.asm" +.include "modules/network/msg/crc.asm" systemSetSpeed: diff --git a/avr/devices/n22/boot.asm b/avr/devices/n22/boot.asm index 098d9e3..8362245 100644 --- a/avr/devices/n22/boot.asm +++ b/avr/devices/n22/boot.asm @@ -100,10 +100,6 @@ main: ; *************************************************************************** ; includes -.include "modules/uart_bitbang/bytelevel.asm" -.include "modules/uart_bitbang/packetlevel.asm" -.include "modules/com2/crc.asm" -.include "common/crc8.asm" .include "common/utils_wait_fixed.asm" .include "common/utils_copy_from_flash.asm" .include "common/utils_copy_sdram.asm" @@ -117,6 +113,8 @@ main: .include "modules/flash/flashprocess.asm" .include "modules/flash/wait.asm" .include "modules/bootloader/main.asm" +.include "modules/network/msg/defs.asm" +.include "modules/network/msg/crc.asm" diff --git a/avr/devices/n23/boot.asm b/avr/devices/n23/boot.asm index d42b2d1..0ef28e4 100644 --- a/avr/devices/n23/boot.asm +++ b/avr/devices/n23/boot.asm @@ -103,10 +103,6 @@ main: ; *************************************************************************** ; includes -.include "modules/uart_bitbang/bytelevel.asm" -.include "modules/uart_bitbang/packetlevel.asm" -.include "modules/com2/crc.asm" -.include "common/crc8.asm" .include "common/utils_wait_fixed.asm" .include "common/utils_copy_from_flash.asm" .include "common/utils_copy_sdram.asm" @@ -120,6 +116,8 @@ main: .include "modules/flash/flashprocess.asm" .include "modules/flash/wait.asm" .include "modules/bootloader/main.asm" +.include "modules/network/msg/defs.asm" +.include "modules/network/msg/crc.asm" diff --git a/avr/devices/t03/boot.asm b/avr/devices/t03/boot.asm index a2c6fb1..8e0f835 100644 --- a/avr/devices/t03/boot.asm +++ b/avr/devices/t03/boot.asm @@ -123,8 +123,6 @@ main: ; *************************************************************************** ; includes -;.include "modules/uart_hw/raw_uart1.asm" -.include "modules/com2/crc.asm" .include "common/utils_wait_fixed.asm" .include "common/utils_copy_from_flash.asm" .include "common/utils_copy_sdram.asm" @@ -136,6 +134,8 @@ main: .include "modules/flash/flashprocess.asm" .include "modules/flash/wait.asm" .include "modules/bootloader/main.asm" +.include "modules/network/msg/defs.asm" +.include "modules/network/msg/crc.asm"