deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Replace WEBSERVER by AVR_WEBSERVER

Browse source
This commit is contained in:
David Kopf 2011-07-24 11:43:17 -04:00
parent 506eced1bc
commit 0bb585fd60
6 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
platform/avr-atmega128rfa1/contiki-main.c
View file

@ -74,7 +74,7 @@
#include "raven-lcd.h"
#endif
#if WEBSERVER
#if AVR_WEBSERVER
#include "httpd-fs.h"
#include "httpd-cgi.h"
#endif
@ -125,7 +125,7 @@ FUSES ={.low = 0xe2, .high = 0x99, .extended = 0xff,};
/* Use existing EEPROM if it passes the integrity test, else reinitialize with build values */
/* Put default MAC address in EEPROM */
#if WEBSERVER
#if AVR_WEBSERVER
extern uint8_t mac_address[8]; //These are defined in httpd-fsdata.c via makefsdata.h
extern uint8_t server_name[16];
extern uint8_t domain_name[30];
@ -354,7 +354,7 @@ uint8_t i;
/*--------------------------Announce the configuration---------------------*/
#if ANNOUNCE_BOOT
#if WEBSERVER
#if AVR_WEBSERVER
uint8_t i;
char buf[80];
unsigned int size;
@ -385,7 +385,7 @@ uint8_t i;
#else
PRINTA("Online\n");
#endif /* WEBSERVER */
#endif /* AVR_WEBSERVER */
#endif /* ANNOUNCE_BOOT */
}