projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge da SC: fixato namespace dell'include guard
[bertos.git]
/
mware
/
formatwr.h
diff --git
a/mware/formatwr.h
b/mware/formatwr.h
index 091fea1efca6ffdeb7cae95290f4899b7830d73b..17cddac4660dadf1c91c61f334ca7d69c61c0902 100755
(executable)
--- a/
mware/formatwr.h
+++ b/
mware/formatwr.h
@@
-1,8
+1,8
@@
/*!
* \file
* <!--
/*!
* \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 devlib/README for information
.
* -->
*
* \version $Id$
* -->
*
* \version $Id$
@@
-12,6
+12,12
@@
/*
* $Log$
/*
* $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.
*
* Revision 1.1 2004/05/23 15:43:16 bernie
* Import mware modules.
*
@@
-21,18
+27,30
@@
#include <stdarg.h>
#include <stdarg.h>
+/*!
+ * \name _formatted_write() configuration
+ * \{
+ */
+#define PRINTF_DISABLED 0
+#define PRINTF_NOMODIFIERS 1
+#define PRINTF_REDUCED 2
+#define PRINTF_NOFLOAT 3
+#define PRINTF_FULL 4
+/* \} */
+
+
int _formatted_write(
const char *format,
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>
int _formatted_write_P(
const char * PROGMEM format,
va_list ap);
#ifdef __AVR__
#include <avr/pgmspace.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__ */
va_list ap);
#endif /* __AVR__ */