Add FatFS library to the Webserver project, extend the HTTP server so that it now...

[pub/USBasp.git] / LUFA / Drivers / USB / Class / CDC.h

diff --git a/LUFA/Drivers/USB/Class/CDC.h b/LUFA/Drivers/USB/Class/CDC.h
index 8ed0cf6..6b4c2c9 100644 (file)
--- a/LUFA/Drivers/USB/Class/CDC.h
+++ b/LUFA/Drivers/USB/Class/CDC.h
@@ -1,21 +1,21 @@
 /*\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
 \r

-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r

   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r


@@ -29,7 +29,7 @@
 */\r
 \r
 /** \ingroup Group_USBClassDrivers\r
 */\r
 \r
 /** \ingroup Group_USBClassDrivers\r

- *  @defgroup Group_USBClassCDC CDC Device Class Driver - LUFA/Drivers/Class/CDC.h\r
+ *  @defgroup Group_USBClassCDC CDC Class Driver - LUFA/Drivers/Class/CDC.h\r

  *\r
  *  \section Sec_Dependencies Module Source Dependencies\r
  *  The following files must be built with any user project that uses this module:\r
  *\r
  *  \section Sec_Dependencies Module Source Dependencies\r
  *  The following files must be built with any user project that uses this module:\r


@@ -41,7 +41,7 @@
  *  Ports, for both Device and Host USB modes. User applications can use this class driver instead of implementing the\r
  *  CDC class manually via the low-level LUFA APIs.\r
  *\r
  *  Ports, for both Device and Host USB modes. User applications can use this class driver instead of implementing the\r
  *  CDC class manually via the low-level LUFA APIs.\r
  *\r

- *  This module is designed to simplify the user code by exposing only the required interface needed to interace with\r
+ *  This module is designed to simplify the user code by exposing only the required interface needed to interface with\r

  *  Hosts or Devices using the USB CDC Class.\r
  *\r
  *  @{\r
  *  Hosts or Devices using the USB CDC Class.\r
  *\r
  *  @{\r


@@ -53,6 +53,10 @@
        /* Includes: */\r
                #include "../HighLevel/USBMode.h"\r
 \r
        /* Includes: */\r
                #include "../HighLevel/USBMode.h"\r
 \r

+               #if defined(NO_STREAM_CALLBACKS)\r
+                       #error The NO_STREAM_CALLBACKS compile time option cannot be used in projects using the library Class drivers.\r
+               #endif\r
+\r

                #if defined(USB_CAN_BE_DEVICE)\r
                        #include "Device/CDC.h"\r
                #endif\r
                #if defined(USB_CAN_BE_DEVICE)\r
                        #include "Device/CDC.h"\r
                #endif\r