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

Patch from Landon Fuller adds const to PROGMEM, required for newer avr-gcc

Browse source
This commit is contained in:
David Kopf 2012-06-10 12:54:11 -04:00
parent 9096da299e
commit 37c407b177
6 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
examples/webserver-ipv6-raven/Huginn/makefsdata.h
View file

@ -1,9 +1,9 @@
#include <avr/eeprom.h> #include <avr/eeprom.h>
/* Link layer ipv6 address will become fe80::2 */ /* Link layer ipv6 address will become fe80::2 */
uint8_t default_mac_address[8] PROGMEM = {0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02}; const uint8_t default_mac_address[8] PROGMEM = {0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02};
uint8_t default_server_name[16] PROGMEM = "huginn"; const uint8_t default_server_name[16] PROGMEM = "huginn";
uint8_t default_domain_name[30] PROGMEM = "localhost"; const uint8_t default_domain_name[30] PROGMEM = "localhost";
uint8_t eemem_mac_address[8] EEMEM = {0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02}; uint8_t eemem_mac_address[8] EEMEM = {0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02};
uint8_t eemem_server_name[16] EEMEM = "huginn"; uint8_t eemem_server_name[16] EEMEM = "huginn";
uint8_t eemem_domain_name[30] EEMEM = "localhost"; uint8_t eemem_domain_name[30] EEMEM = "localhost";

6
examples/webserver-ipv6-raven/Muninn/makefsdata.h
View file

@ -1,9 +1,9 @@
#include <avr/eeprom.h> #include <avr/eeprom.h>
/* Link layer ipv6 address will become fe80::1 */ /* Link layer ipv6 address will become fe80::1 */
uint8_t default_mac_address[8] PROGMEM = {0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01}; const uint8_t default_mac_address[8] PROGMEM = {0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01};
uint8_t default_server_name[16] PROGMEM = "muninn"; const uint8_t default_server_name[16] PROGMEM = "muninn";
uint8_t default_domain_name[30] PROGMEM = "localhost"; const uint8_t default_domain_name[30] PROGMEM = "localhost";
uint8_t eemem_mac_address[8] EEMEM = {0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01}; uint8_t eemem_mac_address[8] EEMEM = {0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01};
uint8_t eemem_server_name[16] EEMEM = "muninn"; uint8_t eemem_server_name[16] EEMEM = "muninn";
uint8_t eemem_domain_name[30] EEMEM = "localhost"; uint8_t eemem_domain_name[30] EEMEM = "localhost";

6
platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fs/makefsdata.h
View file

@ -1,9 +1,9 @@
#include <avr/eeprom.h> #include <avr/eeprom.h>
/* Link layer ipv6 address will become fe80::ff:fe:1 */ /* Link layer ipv6 address will become fe80::ff:fe:1 */
uint8_t default_mac_address[8] PROGMEM = {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01}; const uint8_t default_mac_address[8] PROGMEM = {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01};
uint8_t default_server_name[16] PROGMEM = "ATMEGA128rfa1"; const uint8_t default_server_name[16] PROGMEM = "ATMEGA128rfa1";
uint8_t default_domain_name[30] PROGMEM = "localhost"; const uint8_t default_domain_name[30] PROGMEM = "localhost";
uint8_t eemem_mac_address[8] EEMEM = {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01}; uint8_t eemem_mac_address[8] EEMEM = {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01};
uint8_t eemem_server_name[16] EEMEM = "ATMEGA128rfa1"; uint8_t eemem_server_name[16] EEMEM = "ATMEGA128rfa1";
uint8_t eemem_domain_name[30] EEMEM = "localhost"; uint8_t eemem_domain_name[30] EEMEM = "localhost";

6
platform/avr-atmega128rfa1/apps/raven-webserver/httpd-fsdata.c
View file

@ -4,9 +4,9 @@
/* Link layer ipv6 address will become fe80::ff:fe:1 */ /* Link layer ipv6 address will become fe80::ff:fe:1 */
uint8_t default_mac_address[8] PROGMEM = {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01}; const uint8_t default_mac_address[8] PROGMEM = {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01};
uint8_t default_server_name[16] PROGMEM = "ATMEGA128rfa1"; const uint8_t default_server_name[16] PROGMEM = "ATMEGA128rfa1";
uint8_t default_domain_name[30] PROGMEM = "localhost"; const uint8_t default_domain_name[30] PROGMEM = "localhost";
uint8_t eemem_mac_address[8] EEMEM = {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01}; uint8_t eemem_mac_address[8] EEMEM = {0x02, 0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x01};
uint8_t eemem_server_name[16] EEMEM = "ATMEGA128rfa1"; uint8_t eemem_server_name[16] EEMEM = "ATMEGA128rfa1";
uint8_t eemem_domain_name[30] EEMEM = "localhost"; uint8_t eemem_domain_name[30] EEMEM = "localhost";

6
platform/avr-raven/apps/raven-webserver/httpd-fs/makefsdata.h
View file

@ -1,9 +1,9 @@
#include <avr/eeprom.h> #include <avr/eeprom.h>
/* Link layer ipv6 address will become fe80::11:22ff:fe33:4455 */ /* Link layer ipv6 address will become fe80::11:22ff:fe33:4455 */
uint8_t default_mac_address[8] PROGMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55}; const uint8_t default_mac_address[8] PROGMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55};
uint8_t default_server_name[16] PROGMEM = "Contiki-Raven"; const uint8_t default_server_name[16] PROGMEM = "Contiki-Raven";
uint8_t default_domain_name[30] PROGMEM = "localhost"; const uint8_t default_domain_name[30] PROGMEM = "localhost";
uint8_t eemem_mac_address[8] EEMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55}; uint8_t eemem_mac_address[8] EEMEM = {0x02, 0x11, 0x22, 0xff, 0xfe, 0x33, 0x44, 0x55};
uint8_t eemem_server_name[16] EEMEM = "Contiki-Raven"; uint8_t eemem_server_name[16] EEMEM = "Contiki-Raven";
uint8_t eemem_domain_name[30] EEMEM = "localhost"; uint8_t eemem_domain_name[30] EEMEM = "localhost";

2
platform/avr-raven/apps/raven-webserver/httpd.c
View file

@ -307,8 +307,6 @@ generate_header(void *hstr)
#endif #endif
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
char http_htm[10] PROGMEM ="text/html";
char http_css[ 9] PROGMEM ="text/css";
const char httpd_mime_htm[] HTTPD_STRING_ATTR = "text/html"; const char httpd_mime_htm[] HTTPD_STRING_ATTR = "text/html";
const char httpd_mime_css[] HTTPD_STRING_ATTR = "text/css"; const char httpd_mime_css[] HTTPD_STRING_ATTR = "text/css";
const char httpd_mime_png[] HTTPD_STRING_ATTR = "image/png"; const char httpd_mime_png[] HTTPD_STRING_ATTR = "image/png";