From c1ea4212f2abd78dd967ad229193b2cfc5497ebf Mon Sep 17 00:00:00 2001 From: Martin Preuss Date: Fri, 11 Jul 2025 23:24:26 +0200 Subject: [PATCH] Moved NET_BUFFERS_SIZE to network/defs.asm - Changing this value requires changing the routine NET_Buffer_Locate so its best to keep both in one module. - Redefining it in the individual devices doesn't change the code in NET_Buffer_Locate --- avr/devices/n14/main/main.asm | 1 - avr/devices/n16/main/main.asm | 1 - avr/devices/n19/main/main.asm | 1 - avr/devices/n20/main/main.asm | 1 - avr/devices/n21/main/main.asm | 1 - avr/devices/n22/main/main.asm | 1 - avr/devices/n23/main/main.asm | 1 - avr/devices/n24/main/main.asm | 1 - avr/devices/n25/main/main.asm | 1 - avr/devices/n26/main/main.asm | 1 - avr/devices/n27/main/main.asm | 1 - avr/devices/r04/main/main.asm | 1 - avr/devices/r04/test/main.asm | 1 - avr/devices/r05/main/main.asm | 1 - avr/devices/r05/test/main.asm | 1 - avr/devices/t03/main/main.asm | 7 +++---- avr/modules/network/defs.asm | 5 ++++- 17 files changed, 7 insertions(+), 20 deletions(-) diff --git a/avr/devices/n14/main/main.asm b/avr/devices/n14/main/main.asm index 79f9d05..425a941 100644 --- a/avr/devices/n14/main/main.asm +++ b/avr/devices/n14/main/main.asm @@ -41,7 +41,6 @@ ; generic .equ NET_BUFFERS_NUM = 6 -.equ NET_BUFFERS_SIZE = 32 diff --git a/avr/devices/n16/main/main.asm b/avr/devices/n16/main/main.asm index 216900d..461aeb2 100644 --- a/avr/devices/n16/main/main.asm +++ b/avr/devices/n16/main/main.asm @@ -48,7 +48,6 @@ ; generic .equ NET_BUFFERS_NUM = 6 -.equ NET_BUFFERS_SIZE = 32 diff --git a/avr/devices/n19/main/main.asm b/avr/devices/n19/main/main.asm index 8eecde0..146038d 100644 --- a/avr/devices/n19/main/main.asm +++ b/avr/devices/n19/main/main.asm @@ -35,7 +35,6 @@ .equ NET_BUFFERS_NUM = 6 -.equ NET_BUFFERS_SIZE = 32 ; --------------------------------------------------------------------------- diff --git a/avr/devices/n20/main/main.asm b/avr/devices/n20/main/main.asm index 8889776..fadb333 100644 --- a/avr/devices/n20/main/main.asm +++ b/avr/devices/n20/main/main.asm @@ -47,7 +47,6 @@ ; generic .equ NET_BUFFERS_NUM = 4 -.equ NET_BUFFERS_SIZE = 32 diff --git a/avr/devices/n21/main/main.asm b/avr/devices/n21/main/main.asm index c9e421e..6fa58e2 100644 --- a/avr/devices/n21/main/main.asm +++ b/avr/devices/n21/main/main.asm @@ -48,7 +48,6 @@ ; generic .equ NET_BUFFERS_NUM = 6 -.equ NET_BUFFERS_SIZE = 32 diff --git a/avr/devices/n22/main/main.asm b/avr/devices/n22/main/main.asm index e240018..91c25da 100644 --- a/avr/devices/n22/main/main.asm +++ b/avr/devices/n22/main/main.asm @@ -41,7 +41,6 @@ ; generic .equ NET_BUFFERS_NUM = 6 -.equ NET_BUFFERS_SIZE = 32 diff --git a/avr/devices/n23/main/main.asm b/avr/devices/n23/main/main.asm index c849b01..895bb69 100644 --- a/avr/devices/n23/main/main.asm +++ b/avr/devices/n23/main/main.asm @@ -48,7 +48,6 @@ ; generic .equ NET_BUFFERS_NUM = 6 -.equ NET_BUFFERS_SIZE = 32 .equ PROGRAM_SENSOR_INTERVAL_SECS = 60 .equ PROGRAM_STATS_INTERVAL_MINS = 10 diff --git a/avr/devices/n24/main/main.asm b/avr/devices/n24/main/main.asm index 43b24fa..b11d874 100644 --- a/avr/devices/n24/main/main.asm +++ b/avr/devices/n24/main/main.asm @@ -48,7 +48,6 @@ ; generic .equ NET_BUFFERS_NUM = 6 -.equ NET_BUFFERS_SIZE = 32 .equ PROGRAM_SENSOR_INTERVAL_SECS = 60 .equ PROGRAM_STATS_INTERVAL_MINS = 10 diff --git a/avr/devices/n25/main/main.asm b/avr/devices/n25/main/main.asm index 9f4a3e0..3f52ad5 100644 --- a/avr/devices/n25/main/main.asm +++ b/avr/devices/n25/main/main.asm @@ -41,7 +41,6 @@ ; generic .equ NET_BUFFERS_NUM = 6 -.equ NET_BUFFERS_SIZE = 32 diff --git a/avr/devices/n26/main/main.asm b/avr/devices/n26/main/main.asm index f5bf584..bec6550 100644 --- a/avr/devices/n26/main/main.asm +++ b/avr/devices/n26/main/main.asm @@ -48,7 +48,6 @@ ; generic .equ NET_BUFFERS_NUM = 6 -.equ NET_BUFFERS_SIZE = 32 .equ PROGRAM_SENSOR_INTERVAL_SECS = 60 .equ PROGRAM_STATS_INTERVAL_MINS = 10 diff --git a/avr/devices/n27/main/main.asm b/avr/devices/n27/main/main.asm index a0ca13a..e340261 100644 --- a/avr/devices/n27/main/main.asm +++ b/avr/devices/n27/main/main.asm @@ -48,7 +48,6 @@ ; generic .equ NET_BUFFERS_NUM = 6 -.equ NET_BUFFERS_SIZE = 32 .equ PROGRAM_SENSOR_INTERVAL_SECS = 60 .equ PROGRAM_STATS_INTERVAL_MINS = 10 diff --git a/avr/devices/r04/main/main.asm b/avr/devices/r04/main/main.asm index 71f8590..2aeb170 100644 --- a/avr/devices/r04/main/main.asm +++ b/avr/devices/r04/main/main.asm @@ -85,7 +85,6 @@ .equ NET_BUFFERS_NUM = 9 -.equ NET_BUFFERS_SIZE = 32 .equ UART_HW_MSGNUMINBUF_SIZE = 8 .equ UART_HW_MSGNUMOUTBUF_SIZE = 8 diff --git a/avr/devices/r04/test/main.asm b/avr/devices/r04/test/main.asm index 456d6e0..795a5e8 100644 --- a/avr/devices/r04/test/main.asm +++ b/avr/devices/r04/test/main.asm @@ -85,7 +85,6 @@ .equ NET_BUFFERS_NUM = 8 -.equ NET_BUFFERS_SIZE = 32 .equ UART_HW_MSGNUMINBUF_SIZE = 8 .equ UART_HW_MSGNUMOUTBUF_SIZE = 8 diff --git a/avr/devices/r05/main/main.asm b/avr/devices/r05/main/main.asm index b036a5e..ebf87b3 100644 --- a/avr/devices/r05/main/main.asm +++ b/avr/devices/r05/main/main.asm @@ -76,7 +76,6 @@ .equ NET_BUFFERS_NUM = 8 -.equ NET_BUFFERS_SIZE = 32 .equ UART_HW_MSGNUMINBUF_SIZE = 8 .equ UART_HW_MSGNUMOUTBUF_SIZE = 8 diff --git a/avr/devices/r05/test/main.asm b/avr/devices/r05/test/main.asm index fe106ee..6abe2ca 100644 --- a/avr/devices/r05/test/main.asm +++ b/avr/devices/r05/test/main.asm @@ -85,7 +85,6 @@ .equ NET_BUFFERS_NUM = 8 -.equ NET_BUFFERS_SIZE = 32 .equ UART_HW_MSGNUMINBUF_SIZE = 8 .equ UART_HW_MSGNUMOUTBUF_SIZE = 8 diff --git a/avr/devices/t03/main/main.asm b/avr/devices/t03/main/main.asm index bda6094..8a1799b 100644 --- a/avr/devices/t03/main/main.asm +++ b/avr/devices/t03/main/main.asm @@ -82,7 +82,6 @@ .equ NET_BUFFERS_NUM = 10 -.equ NET_BUFFERS_SIZE = 32 .equ UART_HW_MSGNUMINBUF_SIZE = 8 .equ UART_HW_MSGNUMOUTBUF_SIZE = 8 @@ -110,7 +109,7 @@ rjmp BOOTLOADER_ADDR ; 1: RESET Reset vector use this for flashed system reti ; 2: INT0 External Interrupt Request 0 - rjmp ComOnUart0AttnChangeIsr ; 3: PCINT0 Pin Change Interrupt 0 + rjmp ComOnUart0_AttnChangeIsr ; 3: PCINT0 Pin Change Interrupt 0 reti ; 4: PCINT1 Pin Change Interrupt 1 reti ; 5: WDT Watchdog Time-out reti ; 6: TIM1_CAPT Timer/Counter1 Capture Event @@ -131,8 +130,8 @@ reti ; 21: SPI SPI Serial Transfer Complete reti ; 22: USART0_RXS USART0 Rx Start rjmp ComOnUart0_RxCharIsr ; 23: USART0_RXC USART0 Rx Complete - rjmp ComOnUart0_TxUdreIsr ; 24: USART0_DRE USART0 Data Register Empty - rjmp ComOnUart0_TxCharIsr ; 25: USART0_TXC USART0 Tx Complete + reti ; 24: USART0_DRE USART0 Data Register Empty + reti ; 25: USART0_TXC USART0 Tx Complete reti ; 26: USART1_RXS USART1 Rx Start rjmp TtyOnUart1_RxCharIsr ; 27: USART1_RXC USART1 Rx Complete rjmp TtyOnUart1_TxUdreIsr ; 28: USART1_DRE USART1 Data Register Empty diff --git a/avr/modules/network/defs.asm b/avr/modules/network/defs.asm index e805442..f048c80 100644 --- a/avr/modules/network/defs.asm +++ b/avr/modules/network/defs.asm @@ -9,7 +9,10 @@ ; defs -.equ NET_MSGNUMINBUF_SIZE = 4 ; max buffer nums in ringbuffer (global incoming) + +.equ NET_BUFFERS_SIZE = 32 ; CAVE: need to adapt routine NET_Buffer_Locate when changing this value!! + +.equ NET_MSGNUMINBUF_SIZE = 6 ; max buffer nums in ringbuffer (global incoming) .equ NET_IFACE_OUTMSGBUF_SIZE = 4 ; max buffer nums in ringbuffer (per interface outbound)