Oh boy... lots of changes, too many to describe

[oswald.git] / ui / Fonts.c

diff --git a/ui/Fonts.c b/ui/Fonts.c
index 54929ce5776b9ca991afdaf2c4d559106764b6da..f6083db36228b92725adbf30f864e5e77304936a 100644 (file)
--- a/ui/Fonts.c
+++ b/ui/Fonts.c
@@ -20,15 +20,42 @@
 /*! The number of printable characters in the font tables */
 #define PRINTABLE_CHARACTERS ( 94 )
 
+#if defined(__GNUC__) && (__MSP430X__ > 0)
+__attribute__((__far__))
+#endif
 const unsigned char MetaWatch5table[PRINTABLE_CHARACTERS][5];
+#if defined(__GNUC__) && (__MSP430X__ > 0)
+__attribute__((__far__))
+#endif
 const unsigned char MetaWatch7table[PRINTABLE_CHARACTERS][7];
+#if defined(__GNUC__) && (__MSP430X__ > 0)
+__attribute__((__far__))
+#endif
 const u16t MetaWatch16table[PRINTABLE_CHARACTERS][16];
+#if defined(__GNUC__) && (__MSP430X__ > 0)
+__attribute__((__far__))
+#endif
 const u16t MetaWatchTimeTable[TOTAL_TIME_CHARACTERS][19];
+#if defined(__GNUC__) && (__MSP430X__ > 0)
+__attribute__((__far__))
+#endif
 const unsigned char MetaWatchMonospaced10Table[PRINTABLE_CHARACTERS][10];
 
+#if defined(__GNUC__) && (__MSP430X__ > 0)
+__attribute__((__far__))
+#endif
 const unsigned char MetaWatch5width[PRINTABLE_CHARACTERS];
+#if defined(__GNUC__) && (__MSP430X__ > 0)
+__attribute__((__far__))
+#endif
 const unsigned char MetaWatch7width[PRINTABLE_CHARACTERS];
+#if defined(__GNUC__) && (__MSP430X__ > 0)
+__attribute__((__far__))
+#endif
 const unsigned char MetaWatch16width[PRINTABLE_CHARACTERS];
+#if defined(__GNUC__) && (__MSP430X__ > 0)
+__attribute__((__far__))
+#endif
 const unsigned char MetaWatchTimeWidth[TOTAL_TIME_CHARACTERS];
 
 /*! Font Structure
@@ -189,6 +216,9 @@ void GetCharacterBitmap(unsigned char Character, u16t *pBitmap)
 
 }
 
+#if defined(__GNUC__) && (__MSP430X__ > 0)
+__attribute__((__far__))
+#endif
 const unsigned char MetaWatch5table[PRINTABLE_CHARACTERS][5] = 
 {
   /* character 0x20 (' '): (width = 2) */
@@ -474,6 +504,9 @@ const unsigned char MetaWatch5table[PRINTABLE_CHARACTERS][5] =
   0x00, 0x00, 0x00, 0x00, 0x00,},
 };
 
+#if defined(__GNUC__) && (__MSP430X__ > 0)
+__attribute__((__far__))
+#endif
 const unsigned char MetaWatch5width[PRINTABLE_CHARACTERS] = 
 {
 /*             width    char    hexcode */
@@ -574,6 +607,9 @@ const unsigned char MetaWatch5width[PRINTABLE_CHARACTERS] =
                  3, /*   }      7D      */
 };
 
+#if defined(__GNUC__) && (__MSP430X__ > 0)
+__attribute__((__far__))
+#endif
 const unsigned char MetaWatch7table[PRINTABLE_CHARACTERS][7] = 
 {
 
@@ -860,6 +896,9 @@ const unsigned char MetaWatch7table[PRINTABLE_CHARACTERS][7] =
 
 };
 
+#if defined(__GNUC__) && (__MSP430X__ > 0)
+__attribute__((__far__))
+#endif
 const unsigned char MetaWatch7width[PRINTABLE_CHARACTERS] = {
 /*             width    char    hexcode */
 /*             =====    ====    ======= */
@@ -960,6 +999,9 @@ const unsigned char MetaWatch7width[PRINTABLE_CHARACTERS] = {
 };
 
 
+#if defined(__GNUC__) && (__MSP430X__ > 0)
+__attribute__((__far__))
+#endif
 const u16t MetaWatch16table[PRINTABLE_CHARACTERS][16] = 
 {
   /* character 0x20 (' '): (width=4) */
@@ -1526,6 +1568,9 @@ const u16t MetaWatch16table[PRINTABLE_CHARACTERS][16] =
   0x0006, 0x0002, 0x0001, 0x0000},
 };
 
+#if defined(__GNUC__) && (__MSP430X__ > 0)
+__attribute__((__far__))
+#endif
 const unsigned char MetaWatch16width[PRINTABLE_CHARACTERS] = 
 {
 /*             width    char    hexcode */
@@ -1627,6 +1672,9 @@ const unsigned char MetaWatch16width[PRINTABLE_CHARACTERS] =
 };
 
 /******************************************************************************/
+#if defined(__GNUC__) && (__MSP430X__ > 0)
+__attribute__((__far__))
+#endif
 const u16t MetaWatchTimeTable[TOTAL_TIME_CHARACTERS][19] = 
 {
   /* character 0x30 ('0'): (width=11, offset=0) */
@@ -1714,6 +1762,9 @@ const u16t MetaWatchTimeTable[TOTAL_TIME_CHARACTERS][19] =
   0x0000, 0x0000, 0x0000},
 };
 
+#if defined(__GNUC__) && (__MSP430X__ > 0)
+__attribute__((__far__))
+#endif
 const unsigned char MetaWatchTimeWidth[TOTAL_TIME_CHARACTERS] = 
 {
 /*             width    char    hexcode */
@@ -1734,6 +1785,9 @@ const unsigned char MetaWatchTimeWidth[TOTAL_TIME_CHARACTERS] =
 
 /******************************************************************************/
 
+#if defined(__GNUC__) && (__MSP430X__ > 0)
+__attribute__((__far__))
+#endif
 const unsigned char MetaWatchMonospaced10Table[PRINTABLE_CHARACTERS][10] =  
 {
   {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},