Forgot endif.

[bertos.git] / mware / formatwr.h

diff --git a/mware/formatwr.h b/mware/formatwr.h
old mode 100755 (executable)
new mode 100644 (file)
index 17cddac..5854bd4
--- a/mware/formatwr.h
+++ b/mware/formatwr.h
@@ -1,8 +1,33 @@
-/*!
+/**
  * \file
  * <!--
+* This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
  * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
- * This file is part of DevLib - See devlib/README for information.
+ *
  * -->
  *
  * \version $Id$
@@ -10,24 +35,14 @@
  * \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.
- *
- */
 #ifndef MWARE_FORMATWR_H
 #define MWARE_FORMATWR_H
 
-#include <stdarg.h>
+#include <stdarg.h> /* va_list */
+#include <appconfig.h>
+#include <cpu/attr.h>    /* CPU_HARVARD */
 
-/*!
+/**
  * \name _formatted_write() configuration
  * \{
  */
@@ -38,21 +53,26 @@
 #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
+       #include <mware/pgm.h>
        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 */