From 489911fbfa0f1490b44f7868cc4286bd5a466341 Mon Sep 17 00:00:00 2001
From: bernie <bernie@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Fri, 31 Dec 2004 16:44:29 +0000
Subject: [PATCH] Sanitize for non-Harvard processors.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@321 38d2e660-2303-0410-9eaa-f027e97ec537
---
 mware/font.c |  7 +++++--
 mware/font.h |  7 +++++--
 mware/text.c |  9 +++++++--
 mware/text.h | 13 +++++++++----
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/mware/font.c b/mware/font.c
index b8e4fef9..b69a02cf 100755
--- a/mware/font.c
+++ b/mware/font.c
@@ -15,6 +15,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.4  2004/12/31 16:42:55  bernie
+ *#* Sanitize for non-Harvard processors.
+ *#*
  *#* Revision 1.3  2004/08/25 14:12:09  rasky
  *#* Aggiornato il comment block dei log RCS
  *#*
@@ -43,7 +46,7 @@
 
 #include "font.h"
 
-const prog_uchar font[256 * 6] =
+const PROGMEM font[256 * 6] =
 {
 /* 0x00 */
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /*   */
@@ -333,4 +336,4 @@ const prog_uchar font[256 * 6] =
 	0x0A, 0x09, 0x0D, 0x0A, 0x00, 0x00, /* ý */
 	0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x00, /* þ */
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00  /* ÿ */
-};        
+};
diff --git a/mware/font.h b/mware/font.h
index a9226d35..afdd39c0 100755
--- a/mware/font.h
+++ b/mware/font.h
@@ -14,6 +14,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.4  2004/12/31 16:42:55  bernie
+ *#* Sanitize for non-Harvard processors.
+ *#*
  *#* Revision 1.3  2004/08/25 14:12:09  rasky
  *#* Aggiornato il comment block dei log RCS
  *#*
@@ -33,13 +36,13 @@
 #ifndef FONT_H
 #define FONT_H
 
-#include "avr/pgmspace.h"
+#include "compiler.h" /* PROGMEM */
 
 /* Font size (in pixel) */
 #define FONT_WIDTH 6
 #define FONT_HEIGHT 8
 
 /*! Font table */
-extern const prog_uchar font[256 * FONT_WIDTH];
+extern const PROGMEM uint8_t font[256 * FONT_WIDTH];
 
 #endif /* FONT_H */
diff --git a/mware/text.c b/mware/text.c
index fd8868fd..b000562c 100755
--- a/mware/text.c
+++ b/mware/text.c
@@ -15,6 +15,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.9  2004/12/31 16:44:29  bernie
+ *#* Sanitize for non-Harvard processors.
+ *#*
  *#* Revision 1.8  2004/11/16 21:16:28  bernie
  *#* Update to new naming scheme in mware/gfx.c.
  *#*
@@ -58,8 +61,10 @@
 #include "gfx.h"
 #include "font.h"
 #include "text.h"
+
 #include <debug.h>
 
+
 /*!
  * Flags degli stili algoritmici
  *
@@ -148,7 +153,7 @@ 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_byte(glyph);
+			dots = PGM_READ_CHAR(glyph);
 
 			/* Advance to next column in glyph.
 			 * Expand: advances only once every two columns
@@ -186,7 +191,7 @@ 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_byte(glyph++);
+			*buf++ = PGM_READ_CHAR(glyph++);
 
 	return c;
 }
diff --git a/mware/text.h b/mware/text.h
index 8a36f871..d064215f 100755
--- a/mware/text.h
+++ b/mware/text.h
@@ -15,6 +15,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.9  2004/12/31 16:44:29  bernie
+ *#* Sanitize for non-Harvard processors.
+ *#*
  *#* Revision 1.8  2004/10/03 20:43:37  bernie
  *#* Import changes from project_ks.
  *#*
@@ -41,7 +44,10 @@
 #ifndef MWARE_TEXT_H
 #define MWARE_TEXT_H
 
-#include "compiler.h"
+#include <compiler.h>
+#include <macros.h> /* BV() */
+#include <cpu.h> /* CPU_HARVARD */
+
 #include <stdarg.h>
 
 /*!
@@ -97,14 +103,13 @@ int text_vwidthf(struct Bitmap *bm, const char * fmt, va_list ap);
 int text_widthf(struct Bitmap *bm, const char * fmt, ...) FORMAT(__printf__, 2, 3);
 
 /* Text formatting functions for program-memory strings (mware/text_format.c) */
-#if CPU_AVR
-#include <avr/pgmspace.h>
+#if CPU_HARVARD
 int text_puts_P(const char * PROGMEM str, struct Bitmap *bm);
 int text_vprintf_P(struct Bitmap *bm, const char * PROGMEM fmt, va_list ap);
 int text_printf_P(struct Bitmap *bm, const char * PROGMEM fmt, ...) FORMAT(__printf__, 2, 3);
 int text_xprintf_P(struct Bitmap *bm, uint8_t row, uint8_t col, uint16_t mode, const char * PROGMEM fmt, ...) FORMAT(__printf__, 5, 6);
 int text_vwidthf_P(struct Bitmap *bm, const char * PROGMEM fmt, va_list ap);
 int text_widthf_P(struct Bitmap *bm, const char * PROGMEM fmt, ...);
-#endif /* CPU_AVR */
+#endif /* CPU_HARVARD */
 
 #endif /* MWARE_TEXT_H */
-- 
2.25.1