Remove incorrect Abstract Call Management class specific descriptor from the CDC...

diff --git a/Bootloaders/CDC/Descriptors.c b/Bootloaders/CDC/Descriptors.c
index fdaba83..110c14b 100644 (file)
--- a/Bootloaders/CDC/Descriptors.c
+++ b/Bootloaders/CDC/Descriptors.c
@@ -110,14 +110,6 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
                        .Data                   = {0x10, 0x01}\r
                },\r
 \r
                        .Data                   = {0x10, 0x01}\r
                },\r
 \r

-       .CDC_Functional_CallManagement = \r
-               {\r
-                       .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},\r
-                       .SubType                = 0x01,\r
-                       \r
-                       .Data                   = {0x03, 0x01}\r
-               },\r
-\r

        .CDC_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r
        .CDC_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r

diff --git a/Bootloaders/CDC/Descriptors.h b/Bootloaders/CDC/Descriptors.h
index f123477..faec0dd 100644 (file)
--- a/Bootloaders/CDC/Descriptors.h
+++ b/Bootloaders/CDC/Descriptors.h
@@ -131,7 +131,6 @@
                        USB_Descriptor_Configuration_Header_t    Config;\r
                        USB_Descriptor_Interface_t               CDC_CCI_Interface;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_IntHeader;\r
                        USB_Descriptor_Configuration_Header_t    Config;\r
                        USB_Descriptor_Interface_t               CDC_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                CDC_ManagementEndpoint;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC_Functional_AbstractControlManagement;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_Union;\r
                        USB_Descriptor_Endpoint_t                CDC_ManagementEndpoint;\r

diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.c b/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.c
index b9bc4b1..18cd906 100644 (file)
--- a/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.c
+++ b/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.c
@@ -136,14 +136,6 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .Data                   = {0x01, 0x10}\r
                },\r
 \r
                        .Data                   = {0x01, 0x10}\r
                },\r
 \r

-       .CDC1_Functional_CallManagement = \r
-               {\r
-                       .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},\r
-                       .SubType                = 0x01,\r
-                       \r
-                       .Data                   = {0x03, 0x01}\r
-               },\r
-\r

        .CDC1_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r
        .CDC1_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r


@@ -244,14 +236,6 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .Data                   = {0x01, 0x10}\r
                },\r
 \r
                        .Data                   = {0x01, 0x10}\r
                },\r
 \r

-       .CDC2_Functional_CallManagement = \r
-               {\r
-                       .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},\r
-                       .SubType                = 0x01,\r
-                       \r
-                       .Data                   = {0x03, 0x03}\r
-               },\r
-\r

        .CDC2_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r
        .CDC2_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r

diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h b/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h
index 532c266..89a8855 100644 (file)
--- a/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h
+++ b/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h
@@ -78,7 +78,6 @@
                        USB_Descriptor_Interface_Association_t   CDC1_IAD;\r
                        USB_Descriptor_Interface_t               CDC1_CCI_Interface;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC1_Functional_IntHeader;\r
                        USB_Descriptor_Interface_Association_t   CDC1_IAD;\r
                        USB_Descriptor_Interface_t               CDC1_CCI_Interface;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC1_Functional_IntHeader;\r

-                       CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC1_Functional_CallManagement;\r

                        CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC1_Functional_AbstractControlManagement;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC1_Functional_Union;\r
                        USB_Descriptor_Endpoint_t                CDC1_ManagementEndpoint;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC1_Functional_AbstractControlManagement;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC1_Functional_Union;\r
                        USB_Descriptor_Endpoint_t                CDC1_ManagementEndpoint;\r


@@ -88,7 +87,6 @@
                        USB_Descriptor_Interface_Association_t   CDC2_IAD;\r
                        USB_Descriptor_Interface_t               CDC2_CCI_Interface;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC2_Functional_IntHeader;\r
                        USB_Descriptor_Interface_Association_t   CDC2_IAD;\r
                        USB_Descriptor_Interface_t               CDC2_CCI_Interface;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC2_Functional_IntHeader;\r

-                       CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC2_Functional_CallManagement;\r

                        CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC2_Functional_AbstractControlManagement;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC2_Functional_Union;\r
                        USB_Descriptor_Endpoint_t                CDC2_ManagementEndpoint;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC2_Functional_AbstractControlManagement;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC2_Functional_Union;\r
                        USB_Descriptor_Endpoint_t                CDC2_ManagementEndpoint;\r

diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.c b/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.c
index 5d5400d..0e08d57 100644 (file)
--- a/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.c
+++ b/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.c
@@ -110,14 +110,6 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .Data                   = {0x01, 0x10}\r
                },\r
                \r
                        .Data                   = {0x01, 0x10}\r
                },\r
                \r

-       .CDC_Functional_CallManagement= \r
-               {\r
-                       .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},\r
-                       .SubType                = 0x01,\r
-                       \r
-                       .Data                   = {0x00, 0x00}\r
-               },\r
-               \r

        .CDC_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r
        .CDC_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r

diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h b/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h
index a5e3517..6a65776 100644 (file)
--- a/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h
+++ b/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h
@@ -68,7 +68,6 @@
                        USB_Descriptor_Configuration_Header_t    Config;\r
                        USB_Descriptor_Interface_t               CDC_CCI_Interface;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_Header;\r
                        USB_Descriptor_Configuration_Header_t    Config;\r
                        USB_Descriptor_Interface_t               CDC_CCI_Interface;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_Header;\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                CDC_ManagementEndpoint;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC_Functional_AbstractControlManagement;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_Union;\r
                        USB_Descriptor_Endpoint_t                CDC_ManagementEndpoint;\r

diff --git a/Demos/Device/ClassDriver/VirtualSerial/Descriptors.c b/Demos/Device/ClassDriver/VirtualSerial/Descriptors.c
index 4d513cc..4d85c4f 100644 (file)
--- a/Demos/Device/ClassDriver/VirtualSerial/Descriptors.c
+++ b/Demos/Device/ClassDriver/VirtualSerial/Descriptors.c
@@ -122,14 +122,6 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .Data                   = {0x01, 0x10}\r
                },\r
 \r
                        .Data                   = {0x01, 0x10}\r
                },\r
 \r

-       .CDC_Functional_CallManagement = \r
-               {\r
-                       .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},\r
-                       .SubType                = 0x01,\r
-                       \r
-                       .Data                   = {0x03, 0x01}\r
-               },\r
-\r

        .CDC_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r
        .CDC_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r

diff --git a/Demos/Device/ClassDriver/VirtualSerial/Descriptors.h b/Demos/Device/ClassDriver/VirtualSerial/Descriptors.h
index 2c56fa3..76eb1fc 100644 (file)
--- a/Demos/Device/ClassDriver/VirtualSerial/Descriptors.h
+++ b/Demos/Device/ClassDriver/VirtualSerial/Descriptors.h
@@ -68,7 +68,6 @@
                        USB_Descriptor_Configuration_Header_t    Config;\r
                        USB_Descriptor_Interface_t               CDC_CCI_Interface;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_IntHeader;\r
                        USB_Descriptor_Configuration_Header_t    Config;\r
                        USB_Descriptor_Interface_t               CDC_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                CDC_ManagementEndpoint;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC_Functional_AbstractControlManagement;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_Union;\r
                        USB_Descriptor_Endpoint_t                CDC_ManagementEndpoint;\r

diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c b/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c
index c55aa0c..e4d724b 100644 (file)
--- a/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c
+++ b/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c
@@ -172,14 +172,6 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .Data                   = {0x01, 0x10}\r
                },\r
 \r
                        .Data                   = {0x01, 0x10}\r
                },\r
 \r

-       .CDC_Functional_CallManagement = \r
-               {\r
-                       .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},\r
-                       .SubType                = 0x01,\r
-                       \r
-                       .Data                   = {0x03, 0x01}\r
-               },\r
-\r

        .CDC_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r
        .CDC_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r

diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.h b/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.h
index c754dbe..edc4cce 100644 (file)
--- a/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.h
+++ b/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.h
@@ -76,7 +76,6 @@
                        USB_Descriptor_Interface_Association_t   CDC_IAD;\r
                        USB_Descriptor_Interface_t               CDC_CCI_Interface;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_IntHeader;\r
                        USB_Descriptor_Interface_Association_t   CDC_IAD;\r
                        USB_Descriptor_Interface_t               CDC_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                CDC_ManagementEndpoint;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC_Functional_AbstractControlManagement;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_Union;\r
                        USB_Descriptor_Endpoint_t                CDC_ManagementEndpoint;\r

diff --git a/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c b/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c
index d9b154d..fedf3dd 100644 (file)
--- a/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c
+++ b/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c
@@ -136,14 +136,6 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .Data                   = {0x01, 0x10}\r
                },\r
 \r
                        .Data                   = {0x01, 0x10}\r
                },\r
 \r

-       .CDC1_Functional_CallManagement = \r
-               {\r
-                       .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},\r
-                       .SubType                = 0x01,\r
-                       \r
-                       .Data                   = {0x03, 0x01}\r
-               },\r
-\r

        .CDC1_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r
        .CDC1_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r


@@ -244,14 +236,6 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .Data                   = {0x01, 0x10}\r
                },\r
 \r
                        .Data                   = {0x01, 0x10}\r
                },\r
 \r

-       .CDC2_Functional_CallManagement = \r
-               {\r
-                       .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},\r
-                       .SubType                = 0x01,\r
-                       \r
-                       .Data                   = {0x03, 0x03}\r
-               },\r
-\r

        .CDC2_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r
        .CDC2_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r

diff --git a/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.h b/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.h
index b8ebd0a..c659ad8 100644 (file)
--- a/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.h
+++ b/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.h
@@ -92,7 +92,6 @@
                        USB_Descriptor_Interface_Association_t   CDC1_IAD;\r
                        USB_Descriptor_Interface_t               CDC1_CCI_Interface;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC1_Functional_IntHeader;\r
                        USB_Descriptor_Interface_Association_t   CDC1_IAD;\r
                        USB_Descriptor_Interface_t               CDC1_CCI_Interface;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC1_Functional_IntHeader;\r

-                       CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC1_Functional_CallManagement;\r

                        CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC1_Functional_AbstractControlManagement;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC1_Functional_Union;\r
                        USB_Descriptor_Endpoint_t                CDC1_ManagementEndpoint;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC1_Functional_AbstractControlManagement;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC1_Functional_Union;\r
                        USB_Descriptor_Endpoint_t                CDC1_ManagementEndpoint;\r


@@ -102,7 +101,6 @@
                        USB_Descriptor_Interface_Association_t   CDC2_IAD;\r
                        USB_Descriptor_Interface_t               CDC2_CCI_Interface;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC2_Functional_IntHeader;\r
                        USB_Descriptor_Interface_Association_t   CDC2_IAD;\r
                        USB_Descriptor_Interface_t               CDC2_CCI_Interface;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC2_Functional_IntHeader;\r

-                       CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC2_Functional_CallManagement;\r

                        CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC2_Functional_AbstractControlManagement;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC2_Functional_Union;\r
                        USB_Descriptor_Endpoint_t                CDC2_ManagementEndpoint;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC2_Functional_AbstractControlManagement;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC2_Functional_Union;\r
                        USB_Descriptor_Endpoint_t                CDC2_ManagementEndpoint;\r

diff --git a/Demos/Device/LowLevel/RNDISEthernet/Descriptors.c b/Demos/Device/LowLevel/RNDISEthernet/Descriptors.c
index b25b5d2..ff3dccc 100644 (file)
--- a/Demos/Device/LowLevel/RNDISEthernet/Descriptors.c
+++ b/Demos/Device/LowLevel/RNDISEthernet/Descriptors.c
@@ -109,15 +109,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        \r
                        .Data                   = {0x01, 0x10}\r
                },\r
                        \r
                        .Data                   = {0x01, 0x10}\r
                },\r

-               \r
-       .CDC_Functional_CallManagement= \r
-               {\r
-                       .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},\r
-                       .SubType                = 0x01,\r
-                       \r
-                       .Data                   = {0x00, 0x00}\r
-               },\r
-               \r
+\r

        .CDC_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r
        .CDC_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r

diff --git a/Demos/Device/LowLevel/RNDISEthernet/Descriptors.h b/Demos/Device/LowLevel/RNDISEthernet/Descriptors.h
index 0245049..1840669 100644 (file)
--- a/Demos/Device/LowLevel/RNDISEthernet/Descriptors.h
+++ b/Demos/Device/LowLevel/RNDISEthernet/Descriptors.h
@@ -82,7 +82,6 @@
                        USB_Descriptor_Configuration_Header_t    Config;\r
                        USB_Descriptor_Interface_t               CDC_CCI_Interface;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_Header;\r
                        USB_Descriptor_Configuration_Header_t    Config;\r
                        USB_Descriptor_Interface_t               CDC_CCI_Interface;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_Header;\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                CDC_ManagementEndpoint;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC_Functional_AbstractControlManagement;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_Union;\r
                        USB_Descriptor_Endpoint_t                CDC_ManagementEndpoint;\r

diff --git a/Demos/Device/LowLevel/VirtualSerial/Descriptors.c b/Demos/Device/LowLevel/VirtualSerial/Descriptors.c
index ff2ebf2..56385d4 100644 (file)
--- a/Demos/Device/LowLevel/VirtualSerial/Descriptors.c
+++ b/Demos/Device/LowLevel/VirtualSerial/Descriptors.c
@@ -122,14 +122,6 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .Data                   = {0x01, 0x10}\r
                },\r
 \r
                        .Data                   = {0x01, 0x10}\r
                },\r
 \r

-       .CDC_Functional_CallManagement = \r
-               {\r
-                       .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},\r
-                       .SubType                = 0x01,\r
-                       \r
-                       .Data                   = {0x03, 0x01}\r
-               },\r
-\r

        .CDC_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r
        .CDC_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r

diff --git a/Demos/Device/LowLevel/VirtualSerial/Descriptors.h b/Demos/Device/LowLevel/VirtualSerial/Descriptors.h
index 5610854..8866752 100644 (file)
--- a/Demos/Device/LowLevel/VirtualSerial/Descriptors.h
+++ b/Demos/Device/LowLevel/VirtualSerial/Descriptors.h
@@ -82,7 +82,6 @@
                        USB_Descriptor_Configuration_Header_t    Config;\r
                        USB_Descriptor_Interface_t               CDC_CCI_Interface;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_IntHeader;\r
                        USB_Descriptor_Configuration_Header_t    Config;\r
                        USB_Descriptor_Interface_t               CDC_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                CDC_ManagementEndpoint;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC_Functional_AbstractControlManagement;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_Union;\r
                        USB_Descriptor_Endpoint_t                CDC_ManagementEndpoint;\r

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 4a1dba0..9e36872 100644 (file)
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -66,6 +66,7 @@
   *  - Fixed INTERRUPT_CONTROL_ENDPOINT compile time option preventing other interrupts from occuring while the control endpoint\r
   *    request is being processed, causing possible lockups if a USB interrupt occurs during a transfer\r
   *  - Fixed TeensyHID bootloader not working on some USB AVR models with the official TeensyLoader GUI application\r
   *  - Fixed INTERRUPT_CONTROL_ENDPOINT compile time option preventing other interrupts from occuring while the control endpoint\r
   *    request is being processed, causing possible lockups if a USB interrupt occurs during a transfer\r
   *  - Fixed TeensyHID bootloader not working on some USB AVR models with the official TeensyLoader GUI application\r

+  *  - Remove incorrect Abstract Call Management class specific descriptor from the CDC demos, bootloaders and projects\r

   *\r
   *  \section Sec_ChangeLog100219 Version 100219\r
   *\r
   *\r
   *  \section Sec_ChangeLog100219 Version 100219\r
   *\r

diff --git a/Projects/Benito/Descriptors.c b/Projects/Benito/Descriptors.c
index d29b3b2..85c2c14 100644 (file)
--- a/Projects/Benito/Descriptors.c
+++ b/Projects/Benito/Descriptors.c
@@ -110,14 +110,6 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .Data                   = {0x01, 0x10}\r
                },\r
 \r
                        .Data                   = {0x01, 0x10}\r
                },\r
 \r

-       .CDC_Functional_CallManagement = \r
-               {\r
-                       .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},\r
-                       .SubType                = 0x01,\r
-                       \r
-                       .Data                   = {0x03, 0x01}\r
-               },\r
-\r

        .CDC_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r
        .CDC_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r

diff --git a/Projects/Benito/Descriptors.h b/Projects/Benito/Descriptors.h
index fc47f6f..45bab84 100644 (file)
--- a/Projects/Benito/Descriptors.h
+++ b/Projects/Benito/Descriptors.h
@@ -68,7 +68,6 @@
                        USB_Descriptor_Configuration_Header_t    Config;\r
                        USB_Descriptor_Interface_t               CDC_CCI_Interface;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_IntHeader;\r
                        USB_Descriptor_Configuration_Header_t    Config;\r
                        USB_Descriptor_Interface_t               CDC_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                CDC_ManagementEndpoint;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC_Functional_AbstractControlManagement;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_Union;\r
                        USB_Descriptor_Endpoint_t                CDC_ManagementEndpoint;\r

diff --git a/Projects/LEDNotifier/Descriptors.c b/Projects/LEDNotifier/Descriptors.c
index 367fea3..deef087 100644 (file)
--- a/Projects/LEDNotifier/Descriptors.c
+++ b/Projects/LEDNotifier/Descriptors.c
@@ -122,14 +122,6 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .Data                   = {0x01, 0x10}\r
                },\r
 \r
                        .Data                   = {0x01, 0x10}\r
                },\r
 \r

-       .CDC_Functional_CallManagement = \r
-               {\r
-                       .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},\r
-                       .SubType                = 0x01,\r
-                       \r
-                       .Data                   = {0x03, 0x01}\r
-               },\r
-\r

        .CDC_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r
        .CDC_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r

diff --git a/Projects/LEDNotifier/Descriptors.h b/Projects/LEDNotifier/Descriptors.h
index 2c56fa3..76eb1fc 100644 (file)
--- a/Projects/LEDNotifier/Descriptors.h
+++ b/Projects/LEDNotifier/Descriptors.h
@@ -68,7 +68,6 @@
                        USB_Descriptor_Configuration_Header_t    Config;\r
                        USB_Descriptor_Interface_t               CDC_CCI_Interface;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_IntHeader;\r
                        USB_Descriptor_Configuration_Header_t    Config;\r
                        USB_Descriptor_Interface_t               CDC_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                CDC_ManagementEndpoint;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC_Functional_AbstractControlManagement;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_Union;\r
                        USB_Descriptor_Endpoint_t                CDC_ManagementEndpoint;\r

diff --git a/Projects/USBtoSerial/Descriptors.c b/Projects/USBtoSerial/Descriptors.c
index 3a3e9f2..9343b92 100644 (file)
--- a/Projects/USBtoSerial/Descriptors.c
+++ b/Projects/USBtoSerial/Descriptors.c
@@ -122,14 +122,6 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .Data                   = {0x01, 0x10}\r
                },\r
 \r
                        .Data                   = {0x01, 0x10}\r
                },\r
 \r

-       .CDC_Functional_CallManagement = \r
-               {\r
-                       .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},\r
-                       .SubType                = 0x01,\r
-                       \r
-                       .Data                   = {0x03, 0x01}\r
-               },\r
-\r

        .CDC_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r
        .CDC_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r

diff --git a/Projects/USBtoSerial/Descriptors.h b/Projects/USBtoSerial/Descriptors.h
index fc47f6f..45bab84 100644 (file)
--- a/Projects/USBtoSerial/Descriptors.h
+++ b/Projects/USBtoSerial/Descriptors.h
@@ -68,7 +68,6 @@
                        USB_Descriptor_Configuration_Header_t    Config;\r
                        USB_Descriptor_Interface_t               CDC_CCI_Interface;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_IntHeader;\r
                        USB_Descriptor_Configuration_Header_t    Config;\r
                        USB_Descriptor_Interface_t               CDC_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                CDC_ManagementEndpoint;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC_Functional_AbstractControlManagement;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_Union;\r
                        USB_Descriptor_Endpoint_t                CDC_ManagementEndpoint;\r

diff --git a/Projects/XPLAINBridge/USARTDescriptors.c b/Projects/XPLAINBridge/USARTDescriptors.c
index d1158b2..ca98b33 100644 (file)
--- a/Projects/XPLAINBridge/USARTDescriptors.c
+++ b/Projects/XPLAINBridge/USARTDescriptors.c
@@ -122,14 +122,6 @@ USART_USB_Descriptor_Configuration_t PROGMEM USART_ConfigurationDescriptor =
                        .Data                   = {0x01, 0x10}\r
                },\r
 \r
                        .Data                   = {0x01, 0x10}\r
                },\r
 \r

-       .CDC_Functional_CallManagement = \r
-               {\r
-                       .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},\r
-                       .SubType                = 0x01,\r
-                       \r
-                       .Data                   = {0x03, 0x01}\r
-               },\r
-\r

        .CDC_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r
        .CDC_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r

diff --git a/Projects/XPLAINBridge/USARTDescriptors.h b/Projects/XPLAINBridge/USARTDescriptors.h
index a5e235c..b915301 100644 (file)
--- a/Projects/XPLAINBridge/USARTDescriptors.h
+++ b/Projects/XPLAINBridge/USARTDescriptors.h
@@ -68,7 +68,6 @@
                        USB_Descriptor_Configuration_Header_t    Config;\r
                        USB_Descriptor_Interface_t               CDC_CCI_Interface;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_IntHeader;\r
                        USB_Descriptor_Configuration_Header_t    Config;\r
                        USB_Descriptor_Interface_t               CDC_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                CDC_ManagementEndpoint;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(1)             CDC_Functional_AbstractControlManagement;\r
                        CDC_FUNCTIONAL_DESCRIPTOR(2)             CDC_Functional_Union;\r
                        USB_Descriptor_Endpoint_t                CDC_ManagementEndpoint;\r