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

[pub/USBasp.git] / LUFA / Drivers / USB / LowLevel / DevChapter9.h

diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.h b/LUFA/Drivers/USB/LowLevel/DevChapter9.h
index 8b64982..868c3fa 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.h
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.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


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

+/** \file\r
+ *  \brief USB device standard request management.\r
+ *\r
+ *  This file contains the function prototypes neccesary for the processing of incomming standard control requests\r
+ *  when the library is in USB device mode.\r
+ *\r
+ *  \note This file should not be included directly. It is automatically included as needed by the USB driver\r
+ *        dispatch header located in LUFA/Drivers/USB/USB.h.\r
+ */\r
+\r

 #ifndef __DEVCHAPTER9_H__\r
 #define __DEVCHAPTER9_H__\r
 \r
 #ifndef __DEVCHAPTER9_H__\r
 #define __DEVCHAPTER9_H__\r
 \r


@@ -36,6 +46,7 @@
                #include <avr/pgmspace.h>\r
                #include <avr/eeprom.h>\r
                #include <avr/boot.h>\r
                #include <avr/pgmspace.h>\r
                #include <avr/eeprom.h>\r
                #include <avr/boot.h>\r

+               #include <util/atomic.h>\r

                \r
                #include "../HighLevel/StdDescriptors.h"\r
                #include "../HighLevel/Events.h"\r
                \r
                #include "../HighLevel/StdDescriptors.h"\r
                #include "../HighLevel/Events.h"\r


@@ -48,6 +59,11 @@
                        extern "C" {\r
                #endif\r
 \r
                        extern "C" {\r
                #endif\r
 \r

+       /* Preprocessor Checks: */\r
+               #if !defined(__INCLUDE_FROM_USB_DRIVER)\r
+                       #error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.\r
+               #endif\r
+               \r

        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                        #if defined(USE_SINGLE_DEVICE_CONFIGURATION)\r
        /* Public Interface - May be used in end-application: */\r
                /* Macros: */\r
                        #if defined(USE_SINGLE_DEVICE_CONFIGURATION)\r


@@ -88,6 +104,7 @@
                                 *\r
                                 *  \note This variable should be treated as read-only in the user application, and never manually\r
                                 *        changed in value.\r
                                 *\r
                                 *  \note This variable should be treated as read-only in the user application, and never manually\r
                                 *        changed in value.\r

+                                *        \n\n\r

                                 *\r
                                 *  \note To reduce FLASH usage of the compiled applications where Remote Wakeup is not supported,\r
                                 *        this global and the underlying management code can be disabled by defining the \r
                                 *\r
                                 *  \note To reduce FLASH usage of the compiled applications where Remote Wakeup is not supported,\r
                                 *        this global and the underlying management code can be disabled by defining the \r


@@ -124,7 +141,7 @@
                /* Function Prototypes: */\r
                        void USB_Device_ProcessControlRequest(void);\r
                        \r
                /* Function Prototypes: */\r
                        void USB_Device_ProcessControlRequest(void);\r
                        \r

-                       #if defined(INCLUDE_FROM_DEVCHAPTER9_C)\r
+                       #if defined(__INCLUDE_FROM_DEVCHAPTER9_C)\r

                                static void USB_Device_SetAddress(void);\r
                                static void USB_Device_SetConfiguration(void);\r
                                static void USB_Device_GetConfiguration(void);\r
                                static void USB_Device_SetAddress(void);\r
                                static void USB_Device_SetConfiguration(void);\r
                                static void USB_Device_GetConfiguration(void);\r