More AVR32 achitecture ports.

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

diff --git a/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c b/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c
index 6b20f46..270a98a 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c
+++ b/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c
@@ -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
-\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
@@ -28,11 +28,12 @@
   this software.\r
 */\r
 \r
+#define  __INCLUDE_FROM_USB_DRIVER\r
 #include "ConfigDescriptor.h"\r
 \r
 #if defined(USB_CAN_BE_HOST)\r
-uint8_t USB_GetDeviceConfigDescriptor(uint8_t ConfigNumber, uint16_t* const ConfigSizePtr,\r
-                                      void* BufferPtr, uint16_t BufferSize)\r
+uint8_t USB_Host_GetDeviceConfigDescriptor(uint8_t ConfigNumber, uint16_t* const ConfigSizePtr,\r
+                                           void* BufferPtr, uint16_t BufferSize)\r
 {\r
        uint8_t ErrorCode;\r
        uint8_t ConfigHeader[sizeof(USB_Descriptor_Configuration_Header_t)];\r
@@ -69,7 +70,7 @@ uint8_t USB_GetDeviceConfigDescriptor(uint8_t ConfigNumber, uint16_t* const Conf
 #endif\r
 \r
 void USB_GetNextDescriptorOfType(uint16_t* const BytesRem,\r
-                                 uint8_t** const CurrConfigLoc,\r
+                                 void** const CurrConfigLoc,\r
                                  const uint8_t Type)\r
 {\r
        while (*BytesRem)\r
@@ -82,7 +83,7 @@ void USB_GetNextDescriptorOfType(uint16_t* const BytesRem,
 }\r
 \r
 void USB_GetNextDescriptorOfTypeBefore(uint16_t* const BytesRem,\r
-                                       uint8_t** const CurrConfigLoc,\r
+                                       void** const CurrConfigLoc,\r
                                        const uint8_t Type,\r
                                        const uint8_t BeforeType)\r
 {\r
@@ -103,7 +104,7 @@ void USB_GetNextDescriptorOfTypeBefore(uint16_t* const BytesRem,
 }\r
 \r
 void USB_GetNextDescriptorOfTypeAfter(uint16_t* const BytesRem,\r
-                                      uint8_t** const CurrConfigLoc,\r
+                                      void** const CurrConfigLoc,\r
                                       const uint8_t Type,\r
                                       const uint8_t AfterType)\r
 {\r
@@ -113,7 +114,7 @@ void USB_GetNextDescriptorOfTypeAfter(uint16_t* const BytesRem,
          USB_GetNextDescriptorOfType(BytesRem, CurrConfigLoc, Type);\r
 }\r
                        \r
-uint8_t USB_GetNextDescriptorComp(uint16_t* BytesRem, uint8_t** CurrConfigLoc, ConfigComparatorPtr_t ComparatorRoutine)\r
+uint8_t USB_GetNextDescriptorComp(uint16_t* BytesRem, void** CurrConfigLoc, ConfigComparatorPtr_t ComparatorRoutine)\r
 {\r
        uint8_t ErrorCode;\r
                \r