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

[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 e126835..a7febf4 100644 (file)
--- a/LUFA/Drivers/USB/Class/StillImage.h
+++ b/LUFA/Drivers/USB/Class/StillImage.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


@@ -28,6 +28,15 @@
   this software.\r
 */\r
 \r
   this software.\r
 */\r
 \r

+/** \file\r
+ *  \brief Master include file for the library USB Still Image Class driver.\r
+ *\r
+ *  Master include file for the library USB Still Image Class driver, for both host and device modes, where available.\r
+ *\r
+ *  This file should be included in all user projects making use of this optional class driver, instead of\r
+ *  including any headers in the USB/ClassDriver/Device, USB/ClassDriver/Host or USB/ClassDriver/Common subdirectories.\r
+ */\r
+\r

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


@@ -49,6 +58,10 @@
 #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