diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2011-09-21 06:25:31 +0000 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-09-21 06:25:31 +0000 |
commit | aae59857a2ee47aecbec75cd2c28de2c9b8cf3c7 (patch) | |
tree | 924c10defa604e1a8ecb226c97db3b5d7bd3d2d3 /Demos/Device | |
parent | 8b420566cd4e26a963ad79988ff51f93e396ac42 (diff) | |
download | lufa-aae59857a2ee47aecbec75cd2c28de2c9b8cf3c7.tar.gz lufa-aae59857a2ee47aecbec75cd2c28de2c9b8cf3c7.tar.bz2 lufa-aae59857a2ee47aecbec75cd2c28de2c9b8cf3c7.zip |
Add const qualifier to all PROGMEM data to prevent warnings in newer AVR-GCC compiler versions.
Diffstat (limited to 'Demos/Device')
-rw-r--r-- | Demos/Device/ClassDriver/RNDISEthernet/Lib/Webserver.c | 16 | ||||
-rw-r--r-- | Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.c | 4 | ||||
-rw-r--r-- | Demos/Device/LowLevel/RNDISEthernet/Lib/Webserver.c | 16 |
3 files changed, 18 insertions, 18 deletions
diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Lib/Webserver.c b/Demos/Device/ClassDriver/RNDISEthernet/Lib/Webserver.c index 401dddf0d..241da4896 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/Lib/Webserver.c +++ b/Demos/Device/ClassDriver/RNDISEthernet/Lib/Webserver.c @@ -39,22 +39,22 @@ /** HTTP server response header, for transmission before the page contents. This indicates to the host that a page exists at the * given location, and gives extra connection information. */ -char PROGMEM HTTP200Header[] = "HTTP/1.1 200 OK\r\n" - "Server: LUFA RNDIS\r\n" - "Content-type: text/html\r\n" - "Connection: close\r\n\r\n"; +const char HTTP200Header[] PROGMEM = "HTTP/1.1 200 OK\r\n" + "Server: LUFA RNDIS\r\n" + "Content-type: text/html\r\n" + "Connection: close\r\n\r\n"; /** HTTP server response header, for transmission before a resource not found error. This indicates to the host that the given * given URL is invalid, and gives extra error information. */ -char PROGMEM HTTP404Header[] = "HTTP/1.1 404 Not Found\r\n" - "Server: LUFA RNDIS\r\n" - "Connection: close\r\n\r\n"; +const char HTTP404Header[] PROGMEM = "HTTP/1.1 404 Not Found\r\n" + "Server: LUFA RNDIS\r\n" + "Connection: close\r\n\r\n"; /** HTTP page to serve to the host when a HTTP request is made. This page is too long for a single response, thus it is automatically * broken up into smaller blocks and sent as a series of packets each time the webserver application callback is run. */ -char PROGMEM HTTPPage[] = +const char HTTPPage[] PROGMEM = "<html>" " <head>" " <title>" diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.c b/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.c index a56b34738..6acfff281 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.c +++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.c @@ -38,12 +38,12 @@ #include "RNDIS.h" /** Physical MAC address of the network adapter, which becomes the MAC address of the host for packets sent to the adapter. */ -static MAC_Address_t PROGMEM AdapterMACAddress = {ADAPTER_MAC_ADDRESS}; +static const MAC_Address_t PROGMEM AdapterMACAddress = {ADAPTER_MAC_ADDRESS}; /** Vendor description of the adapter. This is overridden by the INF file required to install the appropriate RNDIS drivers for * the device, but may still be used by the OS in some circumstances. */ -static char PROGMEM AdapterVendorDescription[] = "LUFA RNDIS Adapter"; +static const char PROGMEM AdapterVendorDescription[] = "LUFA RNDIS Adapter"; /** List of RNDIS OID commands supported by this adapter. */ static const uint32_t PROGMEM AdapterSupportedOIDList[] = diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/Webserver.c b/Demos/Device/LowLevel/RNDISEthernet/Lib/Webserver.c index 7bd083d85..d5c415202 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/Lib/Webserver.c +++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/Webserver.c @@ -39,22 +39,22 @@ /** HTTP server response header, for transmission before the page contents. This indicates to the host that a page exists at the * given location, and gives extra connection information. */ -char PROGMEM HTTP200Header[] = "HTTP/1.1 200 OK\r\n" - "Server: LUFA RNDIS\r\n" - "Content-type: text/html\r\n" - "Connection: close\r\n\r\n"; +const char PROGMEM HTTP200Header[] = "HTTP/1.1 200 OK\r\n" + "Server: LUFA RNDIS\r\n" + "Content-type: text/html\r\n" + "Connection: close\r\n\r\n"; /** HTTP server response header, for transmission before a resource not found error. This indicates to the host that the given * given URL is invalid, and gives extra error information. */ -char PROGMEM HTTP404Header[] = "HTTP/1.1 404 Not Found\r\n" - "Server: LUFA RNDIS\r\n" - "Connection: close\r\n\r\n"; +const char PROGMEM HTTP404Header[] = "HTTP/1.1 404 Not Found\r\n" + "Server: LUFA RNDIS\r\n" + "Connection: close\r\n\r\n"; /** HTTP page to serve to the host when a HTTP request is made. This page is too long for a single response, thus it is automatically * broken up into smaller blocks and sent as a series of packets each time the webserver application callback is run. */ -char PROGMEM HTTPPage[] = +const char PROGMEM HTTPPage[] = "<html>" " <head>" " <title>" |