forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add const qualifier to all PROGMEM data to prevent warnings in newer AVR-GCC compiler versions.

Browse Source
pull/1469/head
Dean Camera 13 years ago
parent 8b420566cd
commit aae59857a2
4 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File

16
Demos/Device/ClassDriver/RNDISEthernet/Lib/Webserver.c
Unescape View File

@ -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 /** 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. * given location, and gives extra connection information.
*/ */
char PROGMEM HTTP200Header[] = "HTTP/1.1 200 OK\r\n" const char HTTP200Header[] PROGMEM = "HTTP/1.1 200 OK\r\n"
"Server: LUFA RNDIS\r\n" "Server: LUFA RNDIS\r\n"
"Content-type: text/html\r\n" "Content-type: text/html\r\n"
"Connection: close\r\n\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 /** 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. * given URL is invalid, and gives extra error information.
*/ */
char PROGMEM HTTP404Header[] = "HTTP/1.1 404 Not Found\r\n" const char HTTP404Header[] PROGMEM = "HTTP/1.1 404 Not Found\r\n"
"Server: LUFA RNDIS\r\n" "Server: LUFA RNDIS\r\n"
"Connection: close\r\n\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 /** 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. * 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>" "<html>"
" <head>" " <head>"
" <title>" " <title>"

4
Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.c
Unescape View File

@ -38,12 +38,12 @@
#include "RNDIS.h" #include "RNDIS.h"
/** Physical MAC address of the network adapter, which becomes the MAC address of the host for packets sent to the adapter. */ /** 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 /** 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. * 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. */ /** List of RNDIS OID commands supported by this adapter. */
static const uint32_t PROGMEM AdapterSupportedOIDList[] = static const uint32_t PROGMEM AdapterSupportedOIDList[] =

16
Demos/Device/LowLevel/RNDISEthernet/Lib/Webserver.c
Unescape View File

@ -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 /** 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. * given location, and gives extra connection information.
*/ */
char PROGMEM HTTP200Header[] = "HTTP/1.1 200 OK\r\n" const char PROGMEM HTTP200Header[] = "HTTP/1.1 200 OK\r\n"
"Server: LUFA RNDIS\r\n" "Server: LUFA RNDIS\r\n"
"Content-type: text/html\r\n" "Content-type: text/html\r\n"
"Connection: close\r\n\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 /** 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. * given URL is invalid, and gives extra error information.
*/ */
char PROGMEM HTTP404Header[] = "HTTP/1.1 404 Not Found\r\n" const char PROGMEM HTTP404Header[] = "HTTP/1.1 404 Not Found\r\n"
"Server: LUFA RNDIS\r\n" "Server: LUFA RNDIS\r\n"
"Connection: close\r\n\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 /** 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. * 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>" "<html>"
" <head>" " <head>"
" <title>" " <title>"

4
Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c
Unescape View File

@ -41,7 +41,7 @@
* *
* \hideinitializer * \hideinitializer
*/ */
static uint8_t SPIMaskFromSCKDuration[] PROGMEM = static const uint8_t SPIMaskFromSCKDuration[] PROGMEM =
{ {
#if (F_CPU == 8000000) #if (F_CPU == 8000000)
SPI_SPEED_FCPU_DIV_2, // AVRStudio = 8MHz SPI, Actual = 4MHz SPI SPI_SPEED_FCPU_DIV_2, // AVRStudio = 8MHz SPI, Actual = 4MHz SPI
@ -68,7 +68,7 @@ static uint8_t SPIMaskFromSCKDuration[] PROGMEM =
* *
* \hideinitializer * \hideinitializer
*/ */
static uint16_t TimerCompareFromSCKDuration[] PROGMEM = static const uint16_t TimerCompareFromSCKDuration[] PROGMEM =
{ {
TIMER_COMP(96386), TIMER_COMP(89888), TIMER_COMP(84211), TIMER_COMP(79208), TIMER_COMP(74767), TIMER_COMP(96386), TIMER_COMP(89888), TIMER_COMP(84211), TIMER_COMP(79208), TIMER_COMP(74767),
TIMER_COMP(70797), TIMER_COMP(67227), TIMER_COMP(64000), TIMER_COMP(61069), TIMER_COMP(58395), TIMER_COMP(70797), TIMER_COMP(67227), TIMER_COMP(64000), TIMER_COMP(61069), TIMER_COMP(58395),

Write Preview
Loading…
Cancel
Save