avr: moved defs to correct files.

avr/devices/n11/n11_boot.asm

@@ -4,22 +4,9 @@
 ; This is for the maintenance system (i.e. the flash loader).
 ;
 ; All definitions and changes should go into this file.
-;
-;
-;                                 AtTiny84
-;                                 --------
-;                            VCC  1     14  GND
-;                            PB0  2     13  PA0
-;                            PB1  3     12  PA1  COM-DATA
-;                  /RESET    PB3  4     11  PA2
-;                  KEY1      PB2  5     10  PA3  LED
-;                  COM_ATTN  PA7  6      9  PA4
-;                            PA6  7      8  PA5
-;                                 --------
-;
 ; ***************************************************************************
 
-
+.equ clock=1000000 ; Define the clock frequency
 
 .nolist
 .include "include/tn84def.inc" ; Define device ATtiny84
@@ -36,9 +23,6 @@
 ; ---------------------------------------------------------------------------
 ; generic
 
-.equ clock=1000000 ; Define the clock frequency
-
-
 .include "common/utils_wait.asm"
 .include "modules/com2/defs.asm"
 .include "modules/comproto/defs.asm"
@@ -48,35 +32,14 @@
 ; ---------------------------------------------------------------------------
 ; firmware settings
 
-#define FW_TYPE    AQHOME_FW_TYPE_ATT84_BASE
-#define FW_VERSION 0x0001
-
-
-#define BASE_SYSTEM
-#define WITH_FLASH
+.equ FIRMWARE_VERSION_MAJOR       = 0
+.equ FIRMWARE_VERSION_MINOR       = 0
+.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
 
 
 
 ; ---------------------------------------------------------------------------
-; COM module
-
-.equ COM_BIT_LENGTH      = 52000 ; 104000=9600, 52000=19200, 26000=38400
-
-.equ COM_DDR_DATA        = DDRA
-.equ COM_PORT_DATA       = PORTA
-.equ COM_PIN_DATA        = PINA
-.equ COM_PINNUM_DATA     = PORTA1
-
-.equ COM_DDR_ATTN        = DDRA
-.equ COM_PORT_ATTN       = PORTA
-.equ COM_PIN_ATTN        = PINA
-.equ COM_PINNUM_ATTN     = PORTA7
-
-.equ COM_IRQ_ADDR_ATTN   = PCMSK0
-.equ COM_IRQ_BIT_ATTN    = 7              ; bit 7 in PCMSK0
-.equ COM_IRQ_GIFR_ATTN   = PCIF0
-.equ COM_IRQ_GIMSK_ATTN  = PCIE0
-
+; LED
 
 .equ LED_DDR             = DDRA
 .equ LED_PORT            = PORTA
@@ -114,10 +77,12 @@
   reti ; USI_OVF
 
 
-devInfoBlock:
+devInfoBlock:        ; 12 bytes
 devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
 devInfoId:           .db 'N', 0
 devInfoVersion:      .db 1, 0                 ; version, revision
+firmwareVersion:     .db FIRMWARE_VARIANT_BOOT, FIRMWARE_VERSION_MAJOR
+                     .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
 
 firmwareStart:   rjmp main ; will be overwritten when flashing