avr: fixed includes.
for unknown reasons avra doesn't check #if statements correctly which are meant to protect against double includes...
This commit is contained in:
@@ -27,14 +27,15 @@
|
||||
#endif
|
||||
|
||||
#ifdef APPS_NETWORK
|
||||
APP_BEGIN_NETWORK:
|
||||
.include "apps/network/main.asm"
|
||||
.include "modules/network/msg/reboot-d.asm"
|
||||
.include "modules/network/msg/reboot-r.asm"
|
||||
.include "modules/network/msg/pong-w.asm"
|
||||
.include "modules/network/msg/range-d.asm"
|
||||
.include "modules/network/msg/range-r.asm"
|
||||
.include "common/eeprom-r.asm"
|
||||
.include "common/eeprom-w.asm"
|
||||
APP_END_NETWORK:
|
||||
.equ APP_SIZE_NETWORK = APP_END_NETWORK-APP_BEGIN_NETWORK
|
||||
#endif
|
||||
|
||||
#ifdef APPS_ROUTER
|
||||
@@ -45,8 +46,6 @@
|
||||
.include "modules/network/msg/range-d.asm"
|
||||
.include "modules/network/msg/range-r.asm"
|
||||
.include "modules/network/msg/range-w.asm"
|
||||
.include "common/eeprom-r.asm"
|
||||
.include "common/eeprom-w.asm"
|
||||
#endif
|
||||
|
||||
#ifdef APPS_HUB
|
||||
@@ -57,8 +56,6 @@
|
||||
.include "modules/network/msg/range-d.asm"
|
||||
.include "modules/network/msg/range-r.asm"
|
||||
.include "modules/network/msg/range-w.asm"
|
||||
.include "common/eeprom-r.asm"
|
||||
.include "common/eeprom-w.asm"
|
||||
#endif
|
||||
|
||||
#ifdef APPS_FORWARDER
|
||||
@@ -89,8 +86,6 @@
|
||||
.include "apps/ma_light/data.asm"
|
||||
.include "apps/ma_light/main.asm"
|
||||
.include "apps/ma_light/recv.asm"
|
||||
;.include "common/eeprom-r.asm"
|
||||
;.include "common/eeprom-w.asm"
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user