Update Temperature board driver to be AVR32 compatible when the ADC peripheral driver...

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

diff --git a/LUFA/Drivers/USB/Class/StillImage.h b/LUFA/Drivers/USB/Class/StillImage.h
index e023363..1ba5ff7 100644 (file)
--- a/LUFA/Drivers/USB/Class/StillImage.h
+++ b/LUFA/Drivers/USB/Class/StillImage.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
-\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
+  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
+  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,15 +29,19 @@
 */\r
 \r
 /** \ingroup Group_USBClassDrivers\r
 */\r
 \r
 /** \ingroup Group_USBClassDrivers\r

- *  @defgroup Group_USBClassSI Still Image Device Class Driver - LUFA/Drivers/Class/StillImage.h\r
+ *  @defgroup Group_USBClassSI Still Image Class Driver - LUFA/Drivers/Class/StillImage.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
  *    - LUFA/Drivers/USB/Class/Host/StillImage.c\r
  *\r
  *  \section Module Description\r
  *\r
  *  \section Sec_Dependencies Module Source Dependencies\r
  *  The following files must be built with any user project that uses this module:\r
  *    - LUFA/Drivers/USB/Class/Host/StillImage.c\r
  *\r
  *  \section Module Description\r

- *  Functions, macros, variables, enums and types related to the management of USB Still Image Class interfaces\r
- *  within a USB device.\r
+ *  Still Image Class Driver module. This module contains an internal implementation of the USB Still Image Class,\r
+ *  for USB Host mode only. User applications can use this class driver instead of implementing the Still Image class\r
+ *  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 interface with\r
+ *  Devices using the USB Still Image Class.\r

  *\r
  *  @{\r
  */\r
  *\r
  *  @{\r
  */\r


@@ -45,9 +49,17 @@
 #ifndef _SI_CLASS_H_\r
 #define _SI_CLASS_H_\r
 \r
 #ifndef _SI_CLASS_H_\r
 #define _SI_CLASS_H_\r
 \r

+       /* Macros: */\r
+               #define __INCLUDE_FROM_SI_DRIVER\r
+               #define __INCLUDE_FROM_USB_DRIVER\r
+               \r

        /* 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_HOST)\r
                        #include "Host/StillImage.h"\r
                #endif\r
                #if defined(USB_CAN_BE_HOST)\r
                        #include "Host/StillImage.h"\r
                #endif\r