Permalink
Browse files

Replace PROGMEM with a section directive that silences a compiler war…

…ning.
  • Loading branch information...
1 parent 8dacd4a commit 048351580b38e8b6bf9c24a5f8d8744f434eb512 Mike Smith committed Jul 11, 2011
View
@@ -52,7 +52,7 @@
#define Arial14 Arial_14
-static uint8_t Arial_14[] PROGMEM = {
+static uint8_t Arial_14[] __attribute__(( section(".progmem.data") )) = {
0x1E, 0x6C, // size
0x0A, // width
0x0E, // height
View
@@ -45,7 +45,7 @@
#define ARIAL_BOLD_14_WIDTH 10
#define ARIAL_BOLD_14_HEIGHT 14
-static uint8_t Arial_bold_14[] PROGMEM = {
+static uint8_t Arial_bold_14[] __attribute__(( section(".progmem.data") )) = {
0x22, 0x08, // size
0x0A, // width
0x0E, // height
View
@@ -47,7 +47,7 @@
#define SMALLHOLLOWS_WIDTH 10
#define SMALLHOLLOWS_HEIGHT 7
-static uint8_t SmallHollows[] PROGMEM = {
+static uint8_t SmallHollows[] __attribute__(( section(".progmem.data") )) = {
0x0B, 0x64, // size
0x0A, // width
0x07, // height
View
@@ -45,7 +45,7 @@
#define CORSIVA_12_WIDTH 10
#define CORSIVA_12_HEIGHT 11
-static uint8_t Corsiva_12[] PROGMEM = {
+static uint8_t Corsiva_12[] __attribute__(( section(".progmem.data") )) = {
0x16, 0x3A, // size
0x0A, // width
0x0B, // height
View
@@ -59,7 +59,7 @@
#define F04b_03_WIDTH 10
#define F04b_03_HEIGHT 7
-static uint8_t F04b_03[] PROGMEM = {
+static uint8_t F04b_03[] __attribute__(( section(".progmem.data") )) = {
0x09, 0x42, // size
0x0A, // width
0x07, // height
@@ -179,7 +179,7 @@ static uint8_t F04b_03[] PROGMEM = {
#define F04B_03B_WIDTH 10
#define F04B_03B_HEIGHT 6
-static uint8_t F04b_03b[] PROGMEM = {
+static uint8_t F04b_03b[] __attribute__(( section(".progmem.data") )) = {
0x08, 0x1C, // size
0x0A, // width
0x06, // height
@@ -299,7 +299,7 @@ static uint8_t F04b_03b[] PROGMEM = {
#define F04B_08_WIDTH 10
#define F04B_08_HEIGHT 5
-static uint8_t F04b_08[] PROGMEM = {
+static uint8_t F04b_08[] __attribute__(( section(".progmem.data") )) = {
0x08, 0x59, // size
0x0A, // width
0x05, // height
@@ -420,7 +420,7 @@ static uint8_t F04b_08[] PROGMEM = {
#define F04B_09_WIDTH 10
#define F04B_09_HEIGHT 7
-static uint8_t F04b_09[] PROGMEM = {
+static uint8_t F04b_09[] __attribute__(( section(".progmem.data") )) = {
0x0E, 0x35, // size
0x0A, // width
0x07, // height
@@ -541,7 +541,7 @@ static uint8_t F04b_09[] PROGMEM = {
#define F04B_11_WIDTH 10
#define F04B_11_HEIGHT 7
-static uint8_t F04b_11[] PROGMEM = {
+static uint8_t F04b_11[] __attribute__(( section(".progmem.data") )) = {
0x0E, 0x0B, // size
0x0A, // width
0x07, // height
@@ -661,7 +661,7 @@ static uint8_t F04b_11[] PROGMEM = {
#define F04B_19_WIDTH 10
#define F04B_19_HEIGHT 14
-static uint8_t F04b_19[] PROGMEM = {
+static uint8_t F04b_19[] __attribute__(( section(".progmem.data") )) = {
0x22, 0x94, // size
0x0A, // width
0x0E, // height
@@ -782,7 +782,7 @@ static uint8_t F04b_19[] PROGMEM = {
#define F04B_20_WIDTH 10
#define F04B_20_HEIGHT 8
-static uint8_t F04b_20[] PROGMEM = {
+static uint8_t F04b_20[] __attribute__(( section(".progmem.data") )) = {
0x18, 0xA6, // size
0x0A, // width
0x08, // height
@@ -903,7 +903,7 @@ static uint8_t F04b_20[] PROGMEM = {
#define F04B_21_WIDTH 10
#define F04B_21_HEIGHT 5
-static uint8_t F04b_21[] PROGMEM = {
+static uint8_t F04b_21[] __attribute__(( section(".progmem.data") )) = {
0x08, 0x59, // size
0x0A, // width
0x05, // height
@@ -1024,7 +1024,7 @@ static uint8_t F04b_21[] PROGMEM = {
#define F04B_24_WIDTH 10
#define F04B_24_HEIGHT 6
-static uint8_t F04b_24[] PROGMEM = {
+static uint8_t F04b_24[] __attribute__(( section(".progmem.data") )) = {
0x06, 0x84, // size
0x0A, // width
0x06, // height
@@ -1144,7 +1144,7 @@ static uint8_t F04b_24[] PROGMEM = {
#define F04B_25_WIDTH 10
#define F04B_25_HEIGHT 11
-static uint8_t F04b_25[] PROGMEM = {
+static uint8_t F04b_25[] __attribute__(( section(".progmem.data") )) = {
0x13, 0xF3, // size
0x0A, // width
0x0B, // height
@@ -1265,7 +1265,7 @@ static uint8_t F04b_25[] PROGMEM = {
#define F04B_31_WIDTH 10
#define F04B_31_HEIGHT 10
-static uint8_t F04b_31[] PROGMEM = {
+static uint8_t F04b_31[] __attribute__(( section(".progmem.data") )) = {
0x28, 0xFC, // size
0x0A, // width
0x0A, // height
View
@@ -45,7 +45,7 @@
#define SystemFont5x7 System5x7
-static uint8_t System5x7[] PROGMEM = {
+static uint8_t System5x7[] __attribute__(( section(".progmem.data") )) = {
0x0, 0x0, // size of zero indicates fixed width font, actual length is width * height
0x05, // width
0x07, // height
View
@@ -65,7 +65,7 @@
#define TINY_WIDTH 10
#define TINY_HEIGHT 5
-static uint8_t Tiny[] PROGMEM = {
+static uint8_t Tiny[] __attribute__(( section(".progmem.data") )) = {
0x05, 0xE8, // size
0x0A, // width
0x05, // height
View
@@ -72,7 +72,7 @@
#define TOMTHUMB_WIDTH 10
#define TOMTHUMB_HEIGHT 6
-static uint8_t TomThumb[] PROGMEM = {
+static uint8_t TomThumb[] __attribute__(( section(".progmem.data") )) = {
0x06, 0x96, // size
0x0A, // width
0x06, // height
@@ -46,7 +46,7 @@ row
#define VERDANA24_WIDTH 10
#define VERDANA24_HEIGHT 24
-static uint8_t Verdana24[] PROGMEM = {
+static uint8_t Verdana24[] __attribute__(( section(".progmem.data") )) = {
0x0E, 0xF9, // size
0x0A, // width
0x18, // height
View
@@ -68,7 +68,7 @@
#define WEBBYSMALL_WIDTH 10
#define WEBBYSMALL_HEIGHT 9
-static uint8_t WebbySmall[] PROGMEM = {
+static uint8_t WebbySmall[] __attribute__(( section(".progmem.data") )) = {
0x10, 0xAD, // size
0x0A, // width
0x09, // height
@@ -190,7 +190,7 @@ static uint8_t WebbySmall[] PROGMEM = {
#define WEBBYCAPS_WIDTH 10
#define WEBBYCAPS_HEIGHT 7
-static uint8_t WebbyCaps[] PROGMEM = {
+static uint8_t WebbyCaps[] __attribute__(( section(".progmem.data") )) = {
0x10, 0x3B, // size
0x0A, // width
0x07, // height
View
@@ -8,6 +8,9 @@
* so there is no penalty to including a font file here if its not used
*/
+#ifndef _ALL_FONTS_H
+#define _ALL_FONTS_H
+
#include "SystemFont5x7.h" // system font
#include "Arial14.h" // proportional font
#include "Arial_bold_14.h" // Bold proportional font
@@ -27,3 +30,5 @@
#include "F04b.h" // A family of compact, stylish fonts
#include "CalHenderson.h" // Freeware fonts by Cal Henderson
#include "dictator.h" // a low-rez font in 4 and 8pts
+
+#endif // _ALL_FONTS_H
View
@@ -48,7 +48,7 @@
#define DICTATOR_WIDTH 10
#define DICTATOR_HEIGHT 10
-static uint8_t dictator[] PROGMEM = {
+static uint8_t dictator[] __attribute__(( section(".progmem.data") )) = {
0x08, 0xB4, // size
0x0A, // width
0x0A, // height
@@ -107,7 +107,7 @@ static uint8_t dictator[] PROGMEM = {
#define DICTATOR4_WIDTH 10
#define DICTATOR4_HEIGHT 5
-static uint8_t dictator4[] PROGMEM = {
+static uint8_t dictator4[] __attribute__(( section(".progmem.data") )) = {
0x02, 0x5D, // size
0x0A, // width
0x05, // height
View
@@ -20,7 +20,7 @@
#include <avr/pgmspace.h>
-static uint8_t fixednums15x31[] PROGMEM = {
+static uint8_t fixednums15x31[] __attribute__(( section(".progmem.data") )) = {
0x0, 0x0, // size of zero indicates fixed width font
15, // width
31, // height
View
@@ -18,7 +18,7 @@
#include <avr/pgmspace.h>
-static uint8_t fixednums7x15[] PROGMEM = {
+static uint8_t fixednums7x15[] __attribute__(( section(".progmem.data") )) = {
0x0, 0x0, // size of zero indicates fixed width font
7, // width
15, // height
View
@@ -23,7 +23,7 @@
#include <avr/pgmspace.h>
-static uint8_t fixednums8x16[] PROGMEM = {
+static uint8_t fixednums8x16[] __attribute__(( section(".progmem.data") )) = {
0x0, 0x0, // size of zero indicates fixed width font
8, // width
15, // height

0 comments on commit 0483515

Please sign in to comment.