X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Ftext.h;h=433a88abe124089270207c52b3e3183a28b167ef;hb=6fbd98c855b44d0cc2832cff664e082496529cc9;hp=d064215f26453dc9821c9d6f9180afcab1cdfa75;hpb=489911fbfa0f1490b44f7868cc4286bd5a466341;p=bertos.git

diff --git a/mware/text.h b/mware/text.h
index d064215f..433a88ab 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.11  2005/04/11 19:10:28  bernie
+ *#* Include top-level headers from cfg/ subdir.
+ *#*
+ *#* 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.
  *#*
@@ -44,9 +50,9 @@
 #ifndef MWARE_TEXT_H
 #define MWARE_TEXT_H
 
-#include <compiler.h>
-#include <macros.h> /* BV() */
-#include <cpu.h> /* CPU_HARVARD */
+#include <cfg/compiler.h>
+#include <cfg/macros.h> /* BV() */
+#include <cfg/cpu.h> /* CPU_HARVARD */
 
 #include <stdarg.h>
 
@@ -104,6 +110,7 @@ int text_widthf(struct Bitmap *bm, const char * fmt, ...) FORMAT(__printf__, 2,
 
 /* Text formatting functions for program-memory strings (mware/text_format.c) */
 #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);