X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fformatwr.h;h=740cb1ae7507a95abcf5f8427f3d97a983dd4c1d;hb=2dde5222175bc7b2da7256fc198c51e3a7eb3320;hp=091fea1efca6ffdeb7cae95290f4899b7830d73b;hpb=37d3acaa622b7f695ce57578e56311d031a22d22;p=bertos.git

diff --git a/mware/formatwr.h b/mware/formatwr.h
index 091fea1e..740cb1ae 100755
--- a/mware/formatwr.h
+++ b/mware/formatwr.h
@@ -1,8 +1,8 @@
 /*!
  * \file
  * <!--
- * Copyright (C) 2003,2004 Develer S.r.l. (http://www.develer.com/)
- * All Rights Reserved.
+ * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \version $Id$
@@ -10,31 +10,77 @@
  * \brief Basic "printf", "sprintf" and "fprintf" formatter.
  */
 
-/*
- * $Log$
- * Revision 1.1  2004/05/23 15:43:16  bernie
- * Import mware modules.
- *
- */
+/*#*
+ *#* $Log$
+ *#* 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.
+ *#*
+ *#* Revision 1.5  2004/08/25 14:12:09  rasky
+ *#* Aggiornato il comment block dei log RCS
+ *#*
+ *#* Revision 1.4  2004/08/04 15:53:47  rasky
+ *#* Nuove opzioni di configurazione per formatted_write e ridotto maggiormente l'utilizzo dellos tack
+ *#*
+ *#* Revision 1.3  2004/07/29 22:57:09  bernie
+ *#* Add values for new-style CONFIG_PRINTF option.
+ *#*
+ *#* Revision 1.2  2004/06/03 11:27:09  bernie
+ *#* Add dual-license information.
+ *#*
+ *#* Revision 1.1  2004/05/23 15:43:16  bernie
+ *#* Import mware modules.
+ *#*
+ *#*/
 #ifndef MWARE_FORMATWR_H
 #define MWARE_FORMATWR_H
 
-#include <stdarg.h>
+#include <stdarg.h> /* va_list */
+#include <appconfig.h>
+#include <cfg/cpu.h>    /* CPU_HARVARD */
+
+/*!
+ * \name _formatted_write() configuration
+ * \{
+ */
+#define PRINTF_DISABLED    0
+#define PRINTF_NOMODIFIERS 1
+#define PRINTF_REDUCED     2
+#define PRINTF_NOFLOAT     3
+#define PRINTF_FULL        4
+/* \} */
+
+#ifndef CONFIG_PRINTF_RETURN_COUNT
+	/*! Enable/disable _formatted_write return value */
+	#define CONFIG_PRINTF_RETURN_COUNT 1
+#endif
 
-int _formatted_write(
+int
+_formatted_write(
 	const char *format,
-	void put_one_char(char, void *),
-	void *secret_pointer,
+	void put_char_func(char c, void *user_data),
+	void *user_data,
 	va_list ap);
 
-#ifdef __AVR__
-	#include <avr/pgmspace.h>
+#if CPU_HARVARD
+	#include <mware/pgm.h>
 	int _formatted_write_P(
 		const char * PROGMEM format,
-		void put_one_char(char, void *),
-		void *secret_pointer,
+		void put_char_func(char c, void *user_data),
+		void *user_data,
 		va_list ap);
-#endif /* __AVR__ */
+#endif /* CPU_HARVARD */
 
 #endif /* MWARE_FORMATWR_H */