Update UC3 platform driver support to use the bitmasks defined in the header files...

[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 d635f88..a421b15 100644 (file)
--- a/LUFA/Drivers/USB/Class/StillImage.h
+++ b/LUFA/Drivers/USB/Class/StillImage.h
@@ -1,21 +1,21 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2011.
+

   dean [at] fourwalledcubicle [dot] com
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
 

-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this

   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the

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


@@ -38,13 +38,13 @@
  */
 
 /** \ingroup Group_USBClassDrivers
  */
 
 /** \ingroup Group_USBClassDrivers

- *  @defgroup Group_USBClassSI Still Image Class Driver - LUFA/Drivers/Class/StillImage.h
+ *  \defgroup Group_USBClassSI Still Image Class Driver

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

- *    - LUFA/Drivers/USB/Class/Host/StillImage.c
+ *    - LUFA/Drivers/USB/Class/Host/StillImage.c <i>(Makefile source module name: LUFA_SRC_USBCLASS)</i>

  *
  *

- *  \section Module Description
+ *  \section Sec_ModDescription Module Description

  *  Still Image Class Driver module. This module contains an internal implementation of the USB Still Image Class,
  *  for USB Host mode only. User applications can use this class driver instead of implementing the Still Image class
  *  manually via the low-level LUFA APIs.
  *  Still Image Class Driver module. This module contains an internal implementation of the USB Still Image Class,
  *  for USB Host mode only. User applications can use this class driver instead of implementing the Still Image class
  *  manually via the low-level LUFA APIs.


@@ -59,20 +59,17 @@
 #define _SI_CLASS_H_
 
        /* Macros: */
 #define _SI_CLASS_H_
 
        /* Macros: */

-               #define __INCLUDE_FROM_SI_DRIVER

                #define __INCLUDE_FROM_USB_DRIVER
                #define __INCLUDE_FROM_USB_DRIVER

-               
+               #define __INCLUDE_FROM_SI_DRIVER
+

        /* Includes: */
        /* Includes: */

-               #include "../HighLevel/USBMode.h"
-               
-               #if defined(NO_STREAM_CALLBACKS)
-                       #error The NO_STREAM_CALLBACKS compile time option cannot be used in projects using the library Class drivers.
-               #endif
+               #include "../Core/USBMode.h"

 
                #if defined(USB_CAN_BE_HOST)
                        #include "Host/StillImage.h"
                #endif
 
                #if defined(USB_CAN_BE_HOST)
                        #include "Host/StillImage.h"
                #endif

-               
+

 #endif
 
 /** @} */
 #endif
 
 /** @} */

+