Fixed incorrect comparison in the descriptor callback routine of the TeensyHID bootlo...

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

diff --git a/LUFA/Drivers/Peripheral/SerialStream.h b/LUFA/Drivers/Peripheral/SerialStream.h
index 61c151a..85bdf90 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


@@ -29,11 +29,13 @@
 */\r
 \r
 /** \file\r
 */\r
 \r
 /** \file\r

+ *  \brief Standard avr-libc character stream driver for the USART.\r

  *\r
  *  Serial stream driver for the USART subsystem on supported USB AVRs. This makes use of the functions in the\r
  *\r
  *  Serial stream driver for the USART subsystem on supported USB AVRs. This makes use of the functions in the\r

- *  regular USART driver, but allows the avr-libc standard stream functions (printf, puts, etc.) to work with the\r
+ *  regular USART driver (see \ref Group_Serial), but allows the avr-libc standard stream functions (printf,\r
+ *  puts, etc.) to work with the\r

  *  USART.\r
  *  USART.\r

- **/\r
+ */\r

 \r
 /** \ingroup Group_PeripheralDrivers\r
  *  @defgroup Group_SerialStream Serial Stream Driver - LUFA/Drivers/Peripheral/SerialStream.h\r
 \r
 /** \ingroup Group_PeripheralDrivers\r
  *  @defgroup Group_SerialStream Serial Stream Driver - LUFA/Drivers/Peripheral/SerialStream.h\r


@@ -44,7 +46,8 @@
  *\r
  *  \section Module Description\r
  *  Serial stream driver for the USART subsystem on supported USB AVRs. This makes use of the functions in the\r
  *\r
  *  \section Module Description\r
  *  Serial stream driver for the USART subsystem on supported USB AVRs. This makes use of the functions in the\r

- *  regular USART driver, but allows the avr-libc standard stream functions (printf, puts, etc.) to work with the\r
+ *  regular USART driver (see \ref Group_Serial), but allows the avr-libc standard stream functions (printf,\r
+ *  puts, etc.) to work with the\r

  *  USART.\r
  *\r
  *  @{\r
  *  USART.\r
  *\r
  *  @{\r


@@ -70,7 +73,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 +92,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