Merge branch 't-ml-master' into t-master

[platform/kernel/u-boot.git] / include / serial.h

diff --git a/include/serial.h b/include/serial.h
index bbda3f0..f2638ec 100644 (file)
--- a/include/serial.h
+++ b/include/serial.h
@@ -66,4 +66,22 @@ extern void serial_stdio_init(void);
 extern int serial_assign(char * name);
 extern void serial_reinit_all(void);
 
+/* For usbtty */
+#ifdef CONFIG_USB_TTY
+
+extern int usbtty_getc(void);
+extern void usbtty_putc(const char c);
+extern void usbtty_puts(const char *str);
+extern int usbtty_tstc(void);
+
+#else
+
+/* stubs */
+#define usbtty_getc() 0
+#define usbtty_putc(a)
+#define usbtty_puts(a)
+#define usbtty_tstc() 0
+
+#endif /* CONFIG_USB_TTY */
+
 #endif