Start porting the USB core to the AVR32 UC3B.

[pub/USBasp.git] / LUFA / Drivers / Peripheral / SerialStream.h

diff --git a/LUFA/Drivers/Peripheral/SerialStream.h b/LUFA/Drivers/Peripheral/SerialStream.h
index 80fa681..e22dc42 100644 (file)
--- a/LUFA/Drivers/Peripheral/SerialStream.h
+++ b/LUFA/Drivers/Peripheral/SerialStream.h
@@ -57,6 +57,8 @@
                #include <avr/io.h>\r
                #include <stdio.h>\r
                \r
+               #include "../../Common/Common.h"                \r
+\r
                #include "Serial.h"\r
        \r
        /* Enable C linkage for C++ Compilers: */\r
@@ -70,7 +72,7 @@
                        extern FILE USARTStream;\r
 \r
                /* Function Prototypes: */\r
-               #if defined(INCLUDE_FROM_SERIALSTREAM_C)\r
+               #if defined(__INCLUDE_FROM_SERIALSTREAM_C)\r
                        static int SerialStream_TxByte(char DataByte, FILE *Stream) ATTR_NON_NULL_PTR_ARG(2);\r
                        static int SerialStream_RxByte(FILE *Stream) ATTR_NON_NULL_PTR_ARG(1);\r
                #endif\r
@@ -89,6 +91,7 @@
                                Serial_Init(BaudRate, DoubleSpeed);\r
                                \r
                                stdout = &USARTStream;\r
+                               stdin  = &USARTStream;\r
                        }\r
                        \r
                        /** Turns off the serial stream (and regular USART driver), disabling and returning used hardware to\r