X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=mware%2Ftext.c;h=692119119b32f29f444af74ea7594be07551cb0e;hb=64969cdb6b48f50b642178779baf9e1e317e0645;hp=5def533fa011ee6ad51089fb9ee5ecf607043354;hpb=edce74d23db44bb7857440e8144484dc73c22ee9;p=bertos.git diff --git a/mware/text.c b/mware/text.c index 5def533f..69211911 100755 --- a/mware/text.c +++ b/mware/text.c @@ -15,6 +15,9 @@ /*#* *#* $Log$ + *#* Revision 1.11 2005/01/20 18:46:31 aleph + *#* Fix progmem includes. + *#* *#* Revision 1.10 2005/01/08 09:20:12 bernie *#* Really make it work on both architectures. *#* @@ -156,11 +159,7 @@ static int text_putglyph(char c, struct Bitmap *bm) /* Per ogni colonna di dot del glyph... */ for (i = 0; i < glyph_width; ++i) { - #if CPU_HARVARD - dots = PGM_READ_CHAR(glyph); - #else - dots = *glyph; - #endif + dots = PGM_READ_CHAR(glyph); /* Advance to next column in glyph. * Expand: advances only once every two columns @@ -198,13 +197,7 @@ static int text_putglyph(char c, struct Bitmap *bm) } else /* No style: fast vanilla copy of glyph to line buffer */ while (glyph_width--) - { - #if CPU_HARVARD - *buf++ = PGM_READ_CHAR(glyph++); - #else - *buf++ = *glyph++; - #endif - } + *buf++ = PGM_READ_CHAR(glyph++); return c; }