[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/printf PrintfP.nc, 1.12, 1.13 avr_stdio.h, 1.1, 1.2
John Regehr
regehr at users.sourceforge.net
Wed Jul 2 11:46:21 PDT 2008
Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/printf
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18645
Modified Files:
PrintfP.nc avr_stdio.h
Log Message:
deputize
Index: PrintfP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/printf/PrintfP.nc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** PrintfP.nc 12 Jun 2008 12:57:31 -0000 1.12
--- PrintfP.nc 2 Jul 2008 18:46:18 -0000 1.13
***************
*** 77,84 ****
#ifdef _H_atmega128hardware_H
static int uart_putchar(char c, FILE *stream);
! static FILE atm128_stdout = FDEV_SETUP_STREAM(uart_putchar, NULL, _FDEV_SETUP_WRITE);
#endif
! module PrintfP {
provides {
interface Boot;
--- 77,86 ----
#ifdef _H_atmega128hardware_H
static int uart_putchar(char c, FILE *stream);
! static FILE atm128_stdout =
! FDEV_SETUP_STREAM(TCAST(int (*)(char c, FILE *stream), uart_putchar),
! NULL, _FDEV_SETUP_WRITE);
#endif
! module PrintfP @safe() {
provides {
interface Boot;
Index: avr_stdio.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/printf/avr_stdio.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** avr_stdio.h 20 Aug 2007 16:43:43 -0000 1.1
--- avr_stdio.h 2 Jul 2008 18:46:18 -0000 1.2
***************
*** 406,410 ****
*/
! extern struct __file *__iob[];
#if defined(__STDIO_FDEVOPEN_COMPAT_12)
--- 406,410 ----
*/
! extern struct __file * (COUNT(3) __iob)[];
#if defined(__STDIO_FDEVOPEN_COMPAT_12)
***************
*** 596,600 ****
*/
! extern int vfprintf(FILE *__stream, const char *__fmt, va_list __ap);
/**
--- 596,600 ----
*/
! extern int vfprintf(FILE * ONE __stream, const char * NTS __fmt, va_list __ap);
/**
***************
*** 602,606 ****
in program memory.
*/
! extern int vfprintf_P(FILE *__stream, const char *__fmt, va_list __ap);
/**
--- 602,606 ----
in program memory.
*/
! extern int vfprintf_P(FILE * ONE __stream, const char * NTS __fmt, va_list __ap);
/**
***************
*** 609,618 ****
an error occurred.
*/
! extern int fputc(int __c, FILE *__stream);
#if !defined(__DOXYGEN__)
/* putc() function implementation, required by standard */
! extern int putc(int __c, FILE *__stream);
/* putchar() function implementation, required by standard */
--- 609,618 ----
an error occurred.
*/
! extern int fputc(int __c, FILE * ONE __stream);
#if !defined(__DOXYGEN__)
/* putc() function implementation, required by standard */
! extern int putc(int __c, FILE * ONE __stream);
/* putchar() function implementation, required by standard */
***************
*** 637,641 ****
\c stderr. See \c vfprintf() for details.
*/
! extern int printf(const char *__fmt, ...);
/**
--- 637,641 ----
\c stderr. See \c vfprintf() for details.
*/
! extern int printf(const char * NTS __fmt, ...);
/**
***************
*** 643,647 ****
in program memory.
*/
! extern int printf_P(const char *__fmt, ...);
/**
--- 643,647 ----
in program memory.
*/
! extern int printf_P(const char * NTS __fmt, ...);
/**
***************
*** 651,655 ****
See vfprintf() for details.
*/
! extern int vprintf(const char *__fmt, va_list __ap);
/**
--- 651,655 ----
See vfprintf() for details.
*/
! extern int vprintf(const char * NTS __fmt, va_list __ap);
/**
***************
*** 657,661 ****
to string \c s.
*/
! extern int sprintf(char *__s, const char *__fmt, ...);
/**
--- 657,661 ----
to string \c s.
*/
! extern int sprintf(char * NTS __s, const char * NTS __fmt, ...);
/**
***************
*** 663,667 ****
in program memory.
*/
! extern int sprintf_P(char *__s, const char *__fmt, ...);
/**
--- 663,667 ----
in program memory.
*/
! extern int sprintf_P(char * NTS __s, const char * NTS __fmt, ...);
/**
***************
*** 673,677 ****
\c s if there were enough space.
*/
! extern int snprintf(char *__s, size_t __n, const char *__fmt, ...);
/**
--- 673,677 ----
\c s if there were enough space.
*/
! extern int snprintf(char * NTS __s, size_t __n, const char * NTS __fmt, ...);
/**
***************
*** 679,683 ****
in program memory.
*/
! extern int snprintf_P(char *__s, size_t __n, const char *__fmt, ...);
/**
--- 679,683 ----
in program memory.
*/
! extern int snprintf_P(char * NTS __s, size_t __n, const char * NTS __fmt, ...);
/**
***************
*** 685,689 ****
arguments.
*/
! extern int vsprintf(char *__s, const char *__fmt, va_list ap);
/**
--- 685,689 ----
arguments.
*/
! extern int vsprintf(char * NTS __s, const char * NTS __fmt, va_list ap);
/**
***************
*** 691,695 ****
in program memory.
*/
! extern int vsprintf_P(char *__s, const char *__fmt, va_list ap);
/**
--- 691,695 ----
in program memory.
*/
! extern int vsprintf_P(char * NTS __s, const char * NTS __fmt, va_list ap);
/**
***************
*** 701,705 ****
\c s if there were enough space.
*/
! extern int vsnprintf(char *__s, size_t __n, const char *__fmt, va_list ap);
/**
--- 701,705 ----
\c s if there were enough space.
*/
! extern int vsnprintf(char * NTS __s, size_t __n, const char * NTS __fmt, va_list ap);
/**
***************
*** 707,716 ****
in program memory.
*/
! extern int vsnprintf_P(char *__s, size_t __n, const char *__fmt, va_list ap);
/**
The function \c fprintf performs formatted output to \c stream.
See \c vfprintf() for details.
*/
! extern int fprintf(FILE *__stream, const char *__fmt, ...);
/**
--- 707,716 ----
in program memory.
*/
! extern int vsnprintf_P(char * NTS __s, size_t __n, const char * NTS __fmt, va_list ap);
/**
The function \c fprintf performs formatted output to \c stream.
See \c vfprintf() for details.
*/
! extern int fprintf(FILE * ONE __stream, const char * NTS __fmt, ...);
/**
***************
*** 718,722 ****
in program memory.
*/
! extern int fprintf_P(FILE *__stream, const char *__fmt, ...);
/**
--- 718,722 ----
in program memory.
*/
! extern int fprintf_P(FILE * ONE __stream, const char * NTS __fmt, ...);
/**
***************
*** 725,734 ****
Returns 0 on success and EOF on error.
*/
! extern int fputs(const char *__str, FILE *__stream);
/**
Variant of fputs() where \c str resides in program memory.
*/
! extern int fputs_P(const char *__str, FILE *__stream);
/**
--- 725,734 ----
Returns 0 on success and EOF on error.
*/
! extern int fputs(const char * NTS __str, FILE * ONE __stream);
/**
Variant of fputs() where \c str resides in program memory.
*/
! extern int fputs_P(const char * NTS __str, FILE * ONE __stream);
/**
***************
*** 736,745 ****
character, to \c stdout.
*/
! extern int puts(const char *__str);
/**
Variant of puts() where \c str resides in program memory.
*/
! extern int puts_P(const char *__str);
/**
--- 736,745 ----
character, to \c stdout.
*/
! extern int puts(const char * NTS __str);
/**
Variant of puts() where \c str resides in program memory.
*/
! extern int puts_P(const char * NTS __str);
/**
***************
*** 751,755 ****
*/
extern size_t fwrite(const void *__ptr, size_t __size, size_t __nmemb,
! FILE *__stream);
/**
--- 751,755 ----
*/
extern size_t fwrite(const void *__ptr, size_t __size, size_t __nmemb,
! FILE * ONE __stream);
/**
***************
*** 759,768 ****
distinguish between both situations.
*/
! extern int fgetc(FILE *__stream);
#if !defined(__DOXYGEN__)
/* getc() function implementation, required by standard */
! extern int getc(FILE *__stream);
/* getchar() function implementation, required by standard */
--- 759,768 ----
distinguish between both situations.
*/
! extern int fgetc(FILE * ONE __stream);
#if !defined(__DOXYGEN__)
/* getc() function implementation, required by standard */
! extern int getc(FILE * ONE __stream);
/* getchar() function implementation, required by standard */
***************
*** 798,802 ****
the stream will remain unchanged.
*/
! extern int ungetc(int __c, FILE *__stream);
/**
--- 798,802 ----
the stream will remain unchanged.
*/
! extern int ungetc(int __c, FILE * ONE __stream);
/**
***************
*** 810,814 ****
error flag of \c stream, which can be tested using ferror().
Otherwise, a pointer to the string will be returned. */
! extern char *fgets(char *__str, int __size, FILE *__stream);
/**
--- 810,814 ----
error flag of \c stream, which can be tested using ferror().
Otherwise, a pointer to the string will be returned. */
! extern char *fgets(char * NTS __str, int __size, FILE * ONE __stream);
/**
***************
*** 817,821 ****
It is the caller's responsibility to provide enough storage to hold
the characters read. */
! extern char *gets(char *__str);
/**
--- 817,821 ----
It is the caller's responsibility to provide enough storage to hold
the characters read. */
! extern char *gets(char * NTS __str);
/**
***************
*** 829,838 ****
*/
extern size_t fread(void *__ptr, size_t __size, size_t __nmemb,
! FILE *__stream);
/**
Clear the error and end-of-file flags of \c stream.
*/
! extern void clearerr(FILE *__stream);
#if !defined(__DOXYGEN__)
--- 829,838 ----
*/
extern size_t fread(void *__ptr, size_t __size, size_t __nmemb,
! FILE * ONE __stream);
/**
Clear the error and end-of-file flags of \c stream.
*/
! extern void clearerr(FILE * ONE __stream);
#if !defined(__DOXYGEN__)
***************
*** 845,849 ****
by a call to clearerr().
*/
! extern int feof(FILE *__stream);
#if !defined(__DOXYGEN__)
--- 845,849 ----
by a call to clearerr().
*/
! extern int feof(FILE * ONE __stream);
#if !defined(__DOXYGEN__)
***************
*** 856,860 ****
by a call to clearerr().
*/
! extern int ferror(FILE *__stream);
#if !defined(__DOXYGEN__)
--- 856,860 ----
by a call to clearerr().
*/
! extern int ferror(FILE * ONE __stream);
#if !defined(__DOXYGEN__)
***************
*** 1006,1015 ****
that support it is implemented.
*/
! extern int vfscanf(FILE *__stream, const char *__fmt, va_list __ap);
/**
Variant of vfscanf() using a \c fmt string in program memory.
*/
! extern int vfscanf_P(FILE *__stream, const char *__fmt, va_list __ap);
/**
--- 1006,1015 ----
that support it is implemented.
*/
! extern int vfscanf(FILE * ONE __stream, const char * NTS __fmt, va_list __ap);
/**
Variant of vfscanf() using a \c fmt string in program memory.
*/
! extern int vfscanf_P(FILE * ONE __stream, const char * NTS __fmt, va_list __ap);
/**
***************
*** 1019,1028 ****
See vfscanf() for details.
*/
! extern int fscanf(FILE *__stream, const char *__fmt, ...);
/**
Variant of fscanf() using a \c fmt string in program memory.
*/
! extern int fscanf_P(FILE *__stream, const char *__fmt, ...);
/**
--- 1019,1028 ----
See vfscanf() for details.
*/
! extern int fscanf(FILE * ONE __stream, const char * NTS __fmt, ...);
/**
Variant of fscanf() using a \c fmt string in program memory.
*/
! extern int fscanf_P(FILE * ONE __stream, const char * NTS __fmt, ...);
/**
***************
*** 1031,1040 ****
See vfscanf() for details.
*/
! extern int scanf(const char *__fmt, ...);
/**
Variant of scanf() where \c fmt resides in program memory.
*/
! extern int scanf_P(const char *__fmt, ...);
/**
--- 1031,1040 ----
See vfscanf() for details.
*/
! extern int scanf(const char * NTS __fmt, ...);
/**
Variant of scanf() where \c fmt resides in program memory.
*/
! extern int scanf_P(const char * NTS __fmt, ...);
/**
***************
*** 1044,1048 ****
See vfscanf() for details.
*/
! extern int vscanf(const char *__fmt, va_list __ap);
/**
--- 1044,1048 ----
See vfscanf() for details.
*/
! extern int vscanf(const char * NTS __fmt, va_list __ap);
/**
***************
*** 1052,1061 ****
See vfscanf() for details.
*/
! extern int sscanf(const char *__buf, const char *__fmt, ...);
/**
Variant of sscanf() using a \c fmt string in program memory.
*/
! extern int sscanf_P(const char *__buf, const char *__fmt, ...);
#if defined(__DOXYGEN__)
--- 1052,1061 ----
See vfscanf() for details.
*/
! extern int sscanf(const char * NTS __buf, const char * NTS __fmt, ...);
/**
Variant of sscanf() using a \c fmt string in program memory.
*/
! extern int sscanf_P(const char * NTS __buf, const char * NTS __fmt, ...);
#if defined(__DOXYGEN__)
***************
*** 1067,1073 ****
any buffering.
*/
! extern int fflush(FILE *stream);
#else
! static __inline__ int fflush(FILE *stream __attribute__((unused)))
{
return 0;
--- 1067,1073 ----
any buffering.
*/
! extern int fflush(FILE * ONE stream);
#else
! static __inline__ int fflush(FILE * ONE stream __attribute__((unused)))
{
return 0;
More information about the Tinyos-2-commits
mailing list