From: bernie <bernie@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Sat, 8 Jan 2005 09:20:12 +0000 (+0000)
Subject: Really make it work on both architectures.
X-Git-Tag: 1.0.0~909
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=edce74d23db44bb7857440e8144484dc73c22ee9;p=bertos.git

Really make it work on both architectures.


git-svn-id: https://src.develer.com/svnoss/bertos/trunk@332 38d2e660-2303-0410-9eaa-f027e97ec537
---

diff --git a/mware/text.c b/mware/text.c
index b000562c..5def533f 100755
--- a/mware/text.c
+++ b/mware/text.c
@@ -15,6 +15,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.10  2005/01/08 09:20:12  bernie
+ *#* Really make it work on both architectures.
+ *#*
  *#* Revision 1.9  2004/12/31 16:44:29  bernie
  *#* Sanitize for non-Harvard processors.
  *#*
@@ -153,7 +156,11 @@ static int text_putglyph(char c, struct Bitmap *bm)
 		/* Per ogni colonna di dot del glyph... */
 		for (i = 0; i < glyph_width; ++i)
 		{
-			dots = PGM_READ_CHAR(glyph);
+			#if CPU_HARVARD
+				dots = PGM_READ_CHAR(glyph);
+			#else
+				dots = *glyph;
+			#endif
 
 			/* Advance to next column in glyph.
 			 * Expand: advances only once every two columns
@@ -191,7 +198,13 @@ static int text_putglyph(char c, struct Bitmap *bm)
 	}
 	else /* No style: fast vanilla copy of glyph to line buffer */
 		while (glyph_width--)
-			*buf++ = PGM_READ_CHAR(glyph++);
+		{
+			#if CPU_HARVARD
+				*buf++ = PGM_READ_CHAR(glyph++);
+			#else
+				*buf++ = *glyph++;
+			#endif
+		}
 
 	return c;
 }