Changeset 25a76ab8 in mainline for boot/generic/include/printf.h

Timestamp:

2010-05-08T07:53:23Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• boot/generic/include/printf.h (moved) (moved from boot/generic/printf.h ) (2 diffs)

boot/generic/include/printf.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Martin Decky
+ * Copyright (c) 2001-2004 Jakub Jermar
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup generic
- * @{
- */
 /** @file
  */
 
-#ifndef BOOT_PRINTF_H_
-#define BOOT_PRINTF_H_
+#ifndef BOOT_PRINT_H_
+#define BOOT_PRINT_H_
 
-#define INT8    1
-#define INT16   2
-#define INT32   4
-#define INT64   8
+#include <typedefs.h>
+#include <stdarg.h>
 
-extern void puts(const char *str);
-extern void printf(const char *fmt, ...);
+#define EOF  (-1)
 
-extern void write(const char *str, const int len);
+extern int puts(const char *);
+extern int printf(const char *, ...);
+extern int vprintf(const char *, va_list);
 
 #endif