X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Ftext.h;h=1f8bd89463496dced16fca7d7cdfa1ffd140b160;hb=64969cdb6b48f50b642178779baf9e1e317e0645;hp=8a36f871c9f15c9e91d9234883b5bc2a7250cc52;hpb=a87c086fa5d104d2be6f1166a2f21a23409a1701;p=bertos.git

diff --git a/mware/text.h b/mware/text.h
index 8a36f871..1f8bd894 100755
--- a/mware/text.h
+++ b/mware/text.h
@@ -1,9 +1,9 @@
 /*!
  * \file
  * <!--
- * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
  * Copyright 1999 Bernardo Innocenti <bernie@develer.com>
- * This file is part of DevLib - See devlib/README for information.
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \brief Text graphic routines (interface)
@@ -15,6 +15,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.10  2005/03/01 23:26:46  bernie
+ *#* Use new CPU-neutral program-memory API.
+ *#*
+ *#* 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 +47,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 +106,14 @@ 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
+#include <mware/pgm.h>
 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 */