AVRISP programmer project now has a more robust timeout system, allowing for a doubli...

[pub/USBasp.git] / Projects / Incomplete / StandaloneProgrammer / Descriptors.h

diff --git a/Projects/Incomplete/StandaloneProgrammer/Descriptors.h b/Projects/Incomplete/StandaloneProgrammer/Descriptors.h
index 1f2627b..3b162ae 100644 (file)
--- a/Projects/Incomplete/StandaloneProgrammer/Descriptors.h
+++ b/Projects/Incomplete/StandaloneProgrammer/Descriptors.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
@@ -76,16 +76,6 @@
                typedef struct\r
                {\r
                        USB_Descriptor_Configuration_Header_t    Config;\r
-                       USB_Descriptor_Interface_Association_t   CDC_IAD;\r
-                       USB_Descriptor_Interface_t               CCI_Interface;\r
-                       CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_IntHeader;\r
-                       CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_CallManagement;\r
-                       CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC_Functional_AbstractControlManagement;\r
-                       CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_Union;\r
-                       USB_Descriptor_Endpoint_t                ManagementEndpoint;\r
-                       USB_Descriptor_Interface_t               DCI_Interface;\r
-                       USB_Descriptor_Endpoint_t                DataOutEndpoint;\r
-                       USB_Descriptor_Endpoint_t                DataInEndpoint;\r
                        USB_Descriptor_Interface_t               MSInterface;\r
                        USB_Descriptor_Endpoint_t                MSDataInEndpoint;\r
                        USB_Descriptor_Endpoint_t                MSDataOutEndpoint;\r