Really make it work on both architectures.

[bertos.git] / mware / formatwr.h

diff --git a/mware/formatwr.h b/mware/formatwr.h
index 17cddac4660dadf1c91c61f334ca7d69c61c0902..82718f171c1629a3be578fcb8245468d636e9313 100755 (executable)
--- a/mware/formatwr.h
+++ b/mware/formatwr.h
@@ -10,22 +10,33 @@
  * \brief Basic "printf", "sprintf" and "fprintf" formatter.
  */
 
-/*
- * $Log$
- * 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.
- *
- */
+/*#*
+ *#* $Log$
+ *#* 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 <config.h>
+#include <cpu.h>    /* CPU_HARVARD */
 
 /*!
  * \name _formatted_write() configuration
@@ -38,21 +49,25 @@
 #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_char_func(char c, void *user_data),
        void *user_data,
        va_list ap);
 
-#ifdef __AVR__
-       #include <avr/pgmspace.h>
+#if CPU_HARVARD
        int _formatted_write_P(
                const char * PROGMEM format,
                void put_char_func(char c, void *user_data),
                void *user_data,
                va_list ap);
-#endif /* __AVR__ */
+#endif /* CPU_HARVARD */
 
 #endif /* MWARE_FORMATWR_H */