X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fformatwr.h;h=48aa385a79ae5cad8f6310c1654b038f447fd1b9;hb=6cc971430fda3760940c8f92bb484a6145bbad8d;hp=82718f171c1629a3be578fcb8245468d636e9313;hpb=32841198fc4373115f71761a05088d10f0826223;p=bertos.git

diff --git a/mware/formatwr.h b/mware/formatwr.h
index 82718f17..48aa385a 100755
--- a/mware/formatwr.h
+++ b/mware/formatwr.h
@@ -1,8 +1,8 @@
-/*!
+/**
  * \file
  * <!--
  * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
- * This file is part of DevLib - See devlib/README for information.
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \version $Id$
@@ -12,6 +12,21 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.11  2006/07/19 12:56:27  bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.10  2005/11/04 16:20:02  bernie
+ *#* Fix reference to README.devlib in header.
+ *#*
+ *#* Revision 1.9  2005/07/19 07:25:46  bernie
+ *#* Use appconfig.h instead of cfg/config.h.
+ *#*
+ *#* Revision 1.8  2005/04/11 19:10:28  bernie
+ *#* Include top-level headers from cfg/ subdir.
+ *#*
+ *#* Revision 1.7  2005/02/16 20:28:03  bernie
+ *#* Add %S formatter.
+ *#*
  *#* Revision 1.6  2005/01/08 08:50:06  bernie
  *#* Make more portable.
  *#*
@@ -35,10 +50,10 @@
 #define MWARE_FORMATWR_H
 
 #include <stdarg.h> /* va_list */
-#include <config.h>
-#include <cpu.h>    /* CPU_HARVARD */
+#include <appconfig.h>
+#include <cfg/cpu.h>    /* CPU_HARVARD */
 
-/*!
+/**
  * \name _formatted_write() configuration
  * \{
  */
@@ -50,7 +65,7 @@
 /* \} */
 
 #ifndef CONFIG_PRINTF_RETURN_COUNT
-	/*! Enable/disable _formatted_write return value */
+	/** Enable/disable _formatted_write return value */
 	#define CONFIG_PRINTF_RETURN_COUNT 1
 #endif
 
@@ -62,6 +77,7 @@ _formatted_write(
 	va_list ap);
 
 #if CPU_HARVARD
+	#include <mware/pgm.h>
 	int _formatted_write_P(
 		const char * PROGMEM format,
 		void put_char_func(char c, void *user_data),