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

[pub/USBasp.git] / LUFA / Drivers / USB / HighLevel / ConfigDescriptor.h

diff --git a/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.h b/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.h
index 3c51393..232a9d1 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.h
+++ b/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.h
@@ -1,21 +1,21 @@
 /*\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
-  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, 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
@@ -29,10 +29,14 @@
 */\r
 \r
 /** \file\r
+ *  \brief Configuration descriptor parser API.\r
  *\r
- *  Configuration descriptor parser API. This section of the library gives a friendly API which can be used in\r
- *  host applications to easily parse an attached device's configuration descriptor so that endpoint, interface\r
- *  and other descriptor data can be extracted and used as needed.\r
+ *  This section of the library gives a friendly API which can be used in host applications to easily\r
+ *  parse an attached device's configuration descriptor so that endpoint, interface and other descriptor\r
+ *  data can be extracted and used as needed.\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
 /** \ingroup Group_Descriptors\r
@@ -59,6 +63,11 @@
                        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
                        /** Mask for determining the type of an endpoint from an endpoint descriptor. This should then be compared\r
@@ -109,7 +118,7 @@
                         *\r
                         *  \see \ref USB_GetNextDescriptorComp function for more details\r
                         */\r
-                       typedef uint8_t (* const ConfigComparatorPtr_t)(void* const);\r
+                       typedef uint8_t (* const ConfigComparatorPtr_t)(void*);\r
 \r
                /* Function Prototypes: */\r
                        /** Searches for the next descriptor in the given configuration descriptor using a premade comparator\r
@@ -263,8 +272,8 @@
                        {\r
                                uint16_t CurrDescriptorSize = DESCRIPTOR_CAST(*CurrConfigLoc, USB_Descriptor_Header_t).Size;\r
 \r
-                               *((uint8_t**)CurrConfigLoc) += CurrDescriptorSize;\r
-                               *BytesRem                   -= CurrDescriptorSize;\r
+                               *CurrConfigLoc += CurrDescriptorSize;\r
+                               *BytesRem      -= CurrDescriptorSize;\r
                        }\r
                        \r
        /* Disable C linkage for C++ Compilers: */\r