avr: switched most devices to com2w interface now.

avr/devices/n14/boot/boot.asm

@@ -19,6 +19,7 @@
 .include "devices/all/defs.asm"
 
 .include "common/calls.asm"
+.include "common/utils_io.asm"
 .include "common/utils_wait.asm"
 .include "modules/com2/defs.asm"
 .include "modules/comproto/defs.asm"
@@ -98,8 +99,7 @@ main:
 .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/io_com2w.asm"
 .include "modules/flash/flashxp.asm"
 .include "modules/flash/flash1p.asm"
 .include "modules/flash/flashprocess.asm"

avr/devices/n14/defs.asm

@@ -55,15 +55,15 @@
 .equ COM_DATA_OUTPUT    = PORTB
 .equ COM_DATA_PIN       = PORTB1
 
-.equ COM_ATTN_DDR       = DDRB
-.equ COM_ATTN_INPUT     = PINB
-.equ COM_ATTN_OUTPUT    = PORTB
-.equ COM_ATTN_PIN       = PORTB2
+.equ COM_CLK_DDR       = DDRB
+.equ COM_CLK_INPUT     = PINB
+.equ COM_CLK_OUTPUT    = PORTB
+.equ COM_CLK_PIN       = PORTB2
 
-.equ COM_IRQ_ADDR_ATTN   = PCMSK
-.equ COM_IRQ_BIT_ATTN    = PCINT2       ; bit 2 in PCMSK0 (PCINT2)
-.equ COM_IRQ_GIFR_ATTN   = PCIF
-.equ COM_IRQ_GIMSK_ATTN  = PCIE
+.equ COM_IRQ_ADDR_CLK   = PCMSK
+.equ COM_IRQ_BIT_CLK    = PCINT2       ; bit 2 in PCMSK0 (PCINT2)
+.equ COM_IRQ_GIFR_CLK   = PCIF
+.equ COM_IRQ_GIMSK_CLK  = PCIE
 
 
 

avr/devices/n14/main/main.asm

@@ -40,7 +40,9 @@
 ; ---------------------------------------------------------------------------
 ; generic
 
-.equ NET_BUFFERS_NUM            = 6
+.equ NET_BUFFERS_NUM            =  6
+.equ NET_MSGNUMINBUF_SIZE       =  8 ; max buffer nums in ringbuffer (global incoming)
+.equ NET_IFACE_OUTMSGBUF_SIZE   =  8 ; max buffer nums in ringbuffer (per interface outbound)
 
 
 
@@ -50,7 +52,7 @@
 #define MODULES_CLOCK
 #define MODULES_LED_SIMPLE
 #define MODULES_NETWORK
-#define MODULES_UART_BITBANG
+#define MODULES_COM2W
 #define MODULES_OWI_MASTER
 #define MODULES_DS18B20
 #define MODULES_SK6812
@@ -98,7 +100,7 @@
 
         rjmp BOOTLOADER_ADDR ; Reset vector  ; use this for flashed system
 	reti ; EXT_INT0
-	rjmp UART_BitBang_PcintIsr ; PCI0
+        rjmp com2wPcintIsr         ; PCI0
 	reti ; OC1A
 	reti ; OVF1
 	reti ; OVF0
@@ -199,7 +201,7 @@ onEveryLoop:
 ; ---------------------------------------------------------------------------
 ; defines for network interface
 
-.equ netInterfaceData = uart_bitbang_iface
+.equ netInterfaceData = com2w_iface