Added incomplete MIDIToneGenerator project.

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

diff --git a/LUFA/Drivers/Peripheral/SerialStream.h b/LUFA/Drivers/Peripheral/SerialStream.h
index 61c151a..feadd0a 100644 (file)
--- a/LUFA/Drivers/Peripheral/SerialStream.h
+++ b/LUFA/Drivers/Peripheral/SerialStream.h
@@ -1,13 +1,13 @@
 /*\r
              LUFA Library\r
 /*\r
              LUFA Library\r

-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r

               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r

-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r

 \r
   Permission to use, copy, modify, distribute, and sell this \r
   software and its documentation for any purpose is hereby granted\r
 \r
   Permission to use, copy, modify, distribute, and sell this \r
   software and its documentation for any purpose is hereby granted\r


@@ -70,7 +70,7 @@
                        extern FILE USARTStream;\r
 \r
                /* Function Prototypes: */\r
                        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
                        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 +89,7 @@
                                Serial_Init(BaudRate, DoubleSpeed);\r
                                \r
                                stdout = &USARTStream;\r
                                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
                        }\r
                        \r
                        /** Turns off the serial stream (and regular USART driver), disabling and returning used hardware to\r