From 9c8bd6ed9bdf4d6a5f428c5d6ff867cec858df3b Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Thu, 6 May 2010 11:32:55 +0000 Subject: [PATCH] Remove incorrect Abstract Call Management class specific descriptor from the CDC demos, bootloaders and projects. --- Bootloaders/CDC/Descriptors.c | 8 -------- Bootloaders/CDC/Descriptors.h | 1 - .../ClassDriver/DualVirtualSerial/Descriptors.c | 16 ---------------- .../ClassDriver/DualVirtualSerial/Descriptors.h | 2 -- .../ClassDriver/RNDISEthernet/Descriptors.c | 8 -------- .../ClassDriver/RNDISEthernet/Descriptors.h | 1 - .../ClassDriver/VirtualSerial/Descriptors.c | 8 -------- .../ClassDriver/VirtualSerial/Descriptors.h | 1 - .../ClassDriver/VirtualSerialMouse/Descriptors.c | 8 -------- .../ClassDriver/VirtualSerialMouse/Descriptors.h | 1 - .../LowLevel/DualVirtualSerial/Descriptors.c | 16 ---------------- .../LowLevel/DualVirtualSerial/Descriptors.h | 2 -- .../Device/LowLevel/RNDISEthernet/Descriptors.c | 10 +--------- .../Device/LowLevel/RNDISEthernet/Descriptors.h | 1 - .../Device/LowLevel/VirtualSerial/Descriptors.c | 8 -------- .../Device/LowLevel/VirtualSerial/Descriptors.h | 1 - LUFA/ManPages/ChangeLog.txt | 1 + Projects/Benito/Descriptors.c | 8 -------- Projects/Benito/Descriptors.h | 1 - Projects/LEDNotifier/Descriptors.c | 8 -------- Projects/LEDNotifier/Descriptors.h | 1 - Projects/USBtoSerial/Descriptors.c | 8 -------- Projects/USBtoSerial/Descriptors.h | 1 - Projects/XPLAINBridge/USARTDescriptors.c | 8 -------- Projects/XPLAINBridge/USARTDescriptors.h | 1 - 25 files changed, 2 insertions(+), 127 deletions(-) diff --git a/Bootloaders/CDC/Descriptors.c b/Bootloaders/CDC/Descriptors.c index fdaba8322e..110c14bd92 100644 --- a/Bootloaders/CDC/Descriptors.c +++ b/Bootloaders/CDC/Descriptors.c @@ -110,14 +110,6 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor = .Data = {0x10, 0x01} }, - .CDC_Functional_CallManagement = - { - .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24}, - .SubType = 0x01, - - .Data = {0x03, 0x01} - }, - .CDC_Functional_AbstractControlManagement = { .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24}, diff --git a/Bootloaders/CDC/Descriptors.h b/Bootloaders/CDC/Descriptors.h index f123477463..faec0ddaea 100644 --- a/Bootloaders/CDC/Descriptors.h +++ b/Bootloaders/CDC/Descriptors.h @@ -131,7 +131,6 @@ USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Interface_t CDC_CCI_Interface; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_IntHeader; - CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_CallManagement; CDC_FUNCTIONAL_DESCRIPTOR(1) CDC_Functional_AbstractControlManagement; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Union; USB_Descriptor_Endpoint_t CDC_ManagementEndpoint; diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.c b/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.c index b9bc4b112b..18cd906c48 100644 --- 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} }, - .CDC1_Functional_CallManagement = - { - .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24}, - .SubType = 0x01, - - .Data = {0x03, 0x01} - }, - .CDC1_Functional_AbstractControlManagement = { .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24}, @@ -244,14 +236,6 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .Data = {0x01, 0x10} }, - .CDC2_Functional_CallManagement = - { - .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24}, - .SubType = 0x01, - - .Data = {0x03, 0x03} - }, - .CDC2_Functional_AbstractControlManagement = { .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24}, diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h b/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h index 532c266a48..89a8855adb 100644 --- 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; USB_Descriptor_Interface_t CDC1_CCI_Interface; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC1_Functional_IntHeader; - CDC_FUNCTIONAL_DESCRIPTOR(2) CDC1_Functional_CallManagement; CDC_FUNCTIONAL_DESCRIPTOR(1) CDC1_Functional_AbstractControlManagement; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC1_Functional_Union; USB_Descriptor_Endpoint_t CDC1_ManagementEndpoint; @@ -88,7 +87,6 @@ USB_Descriptor_Interface_Association_t CDC2_IAD; USB_Descriptor_Interface_t CDC2_CCI_Interface; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC2_Functional_IntHeader; - CDC_FUNCTIONAL_DESCRIPTOR(2) CDC2_Functional_CallManagement; CDC_FUNCTIONAL_DESCRIPTOR(1) CDC2_Functional_AbstractControlManagement; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC2_Functional_Union; USB_Descriptor_Endpoint_t CDC2_ManagementEndpoint; diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.c b/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.c index 5d5400d539..0e08d57fe7 100644 --- 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} }, - .CDC_Functional_CallManagement= - { - .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24}, - .SubType = 0x01, - - .Data = {0x00, 0x00} - }, - .CDC_Functional_AbstractControlManagement = { .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24}, diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h b/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h index a5e3517256..6a65776463 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h +++ b/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h @@ -68,7 +68,6 @@ USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Interface_t CDC_CCI_Interface; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Header; - CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_CallManagement; CDC_FUNCTIONAL_DESCRIPTOR(1) CDC_Functional_AbstractControlManagement; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Union; USB_Descriptor_Endpoint_t CDC_ManagementEndpoint; diff --git a/Demos/Device/ClassDriver/VirtualSerial/Descriptors.c b/Demos/Device/ClassDriver/VirtualSerial/Descriptors.c index 4d513cc500..4d85c4f00b 100644 --- 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} }, - .CDC_Functional_CallManagement = - { - .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24}, - .SubType = 0x01, - - .Data = {0x03, 0x01} - }, - .CDC_Functional_AbstractControlManagement = { .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24}, diff --git a/Demos/Device/ClassDriver/VirtualSerial/Descriptors.h b/Demos/Device/ClassDriver/VirtualSerial/Descriptors.h index 2c56fa349a..76eb1fc243 100644 --- a/Demos/Device/ClassDriver/VirtualSerial/Descriptors.h +++ b/Demos/Device/ClassDriver/VirtualSerial/Descriptors.h @@ -68,7 +68,6 @@ USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Interface_t CDC_CCI_Interface; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_IntHeader; - CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_CallManagement; CDC_FUNCTIONAL_DESCRIPTOR(1) CDC_Functional_AbstractControlManagement; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Union; USB_Descriptor_Endpoint_t CDC_ManagementEndpoint; diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c b/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c index c55aa0c0cf..e4d724b5a1 100644 --- 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} }, - .CDC_Functional_CallManagement = - { - .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24}, - .SubType = 0x01, - - .Data = {0x03, 0x01} - }, - .CDC_Functional_AbstractControlManagement = { .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24}, diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.h b/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.h index c754dbe070..edc4ccea48 100644 --- 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; USB_Descriptor_Interface_t CDC_CCI_Interface; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_IntHeader; - CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_CallManagement; CDC_FUNCTIONAL_DESCRIPTOR(1) CDC_Functional_AbstractControlManagement; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Union; USB_Descriptor_Endpoint_t CDC_ManagementEndpoint; diff --git a/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c b/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c index d9b154ddbf..fedf3dd481 100644 --- 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} }, - .CDC1_Functional_CallManagement = - { - .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24}, - .SubType = 0x01, - - .Data = {0x03, 0x01} - }, - .CDC1_Functional_AbstractControlManagement = { .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24}, @@ -244,14 +236,6 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .Data = {0x01, 0x10} }, - .CDC2_Functional_CallManagement = - { - .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24}, - .SubType = 0x01, - - .Data = {0x03, 0x03} - }, - .CDC2_Functional_AbstractControlManagement = { .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24}, diff --git a/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.h b/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.h index b8ebd0a4f5..c659ad81cd 100644 --- 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; USB_Descriptor_Interface_t CDC1_CCI_Interface; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC1_Functional_IntHeader; - CDC_FUNCTIONAL_DESCRIPTOR(2) CDC1_Functional_CallManagement; CDC_FUNCTIONAL_DESCRIPTOR(1) CDC1_Functional_AbstractControlManagement; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC1_Functional_Union; USB_Descriptor_Endpoint_t CDC1_ManagementEndpoint; @@ -102,7 +101,6 @@ USB_Descriptor_Interface_Association_t CDC2_IAD; USB_Descriptor_Interface_t CDC2_CCI_Interface; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC2_Functional_IntHeader; - CDC_FUNCTIONAL_DESCRIPTOR(2) CDC2_Functional_CallManagement; CDC_FUNCTIONAL_DESCRIPTOR(1) CDC2_Functional_AbstractControlManagement; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC2_Functional_Union; USB_Descriptor_Endpoint_t CDC2_ManagementEndpoint; diff --git a/Demos/Device/LowLevel/RNDISEthernet/Descriptors.c b/Demos/Device/LowLevel/RNDISEthernet/Descriptors.c index b25b5d2bae..ff3dcccb09 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/Descriptors.c +++ b/Demos/Device/LowLevel/RNDISEthernet/Descriptors.c @@ -109,15 +109,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .Data = {0x01, 0x10} }, - - .CDC_Functional_CallManagement= - { - .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24}, - .SubType = 0x01, - - .Data = {0x00, 0x00} - }, - + .CDC_Functional_AbstractControlManagement = { .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24}, diff --git a/Demos/Device/LowLevel/RNDISEthernet/Descriptors.h b/Demos/Device/LowLevel/RNDISEthernet/Descriptors.h index 02450490b9..1840669f23 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/Descriptors.h +++ b/Demos/Device/LowLevel/RNDISEthernet/Descriptors.h @@ -82,7 +82,6 @@ USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Interface_t CDC_CCI_Interface; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Header; - CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_CallManagement; CDC_FUNCTIONAL_DESCRIPTOR(1) CDC_Functional_AbstractControlManagement; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Union; USB_Descriptor_Endpoint_t CDC_ManagementEndpoint; diff --git a/Demos/Device/LowLevel/VirtualSerial/Descriptors.c b/Demos/Device/LowLevel/VirtualSerial/Descriptors.c index ff2ebf2e95..56385d4672 100644 --- 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} }, - .CDC_Functional_CallManagement = - { - .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24}, - .SubType = 0x01, - - .Data = {0x03, 0x01} - }, - .CDC_Functional_AbstractControlManagement = { .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24}, diff --git a/Demos/Device/LowLevel/VirtualSerial/Descriptors.h b/Demos/Device/LowLevel/VirtualSerial/Descriptors.h index 5610854d22..8866752db8 100644 --- a/Demos/Device/LowLevel/VirtualSerial/Descriptors.h +++ b/Demos/Device/LowLevel/VirtualSerial/Descriptors.h @@ -82,7 +82,6 @@ USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Interface_t CDC_CCI_Interface; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_IntHeader; - CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_CallManagement; CDC_FUNCTIONAL_DESCRIPTOR(1) CDC_Functional_AbstractControlManagement; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Union; USB_Descriptor_Endpoint_t CDC_ManagementEndpoint; diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt index 4a1dba0eed..9e36872c89 100644 --- 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 * request is being processed, causing possible lockups if a USB interrupt occurs during a transfer * - Fixed TeensyHID bootloader not working on some USB AVR models with the official TeensyLoader GUI application + * - Remove incorrect Abstract Call Management class specific descriptor from the CDC demos, bootloaders and projects * * \section Sec_ChangeLog100219 Version 100219 * diff --git a/Projects/Benito/Descriptors.c b/Projects/Benito/Descriptors.c index d29b3b2098..85c2c14088 100644 --- a/Projects/Benito/Descriptors.c +++ b/Projects/Benito/Descriptors.c @@ -110,14 +110,6 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .Data = {0x01, 0x10} }, - .CDC_Functional_CallManagement = - { - .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24}, - .SubType = 0x01, - - .Data = {0x03, 0x01} - }, - .CDC_Functional_AbstractControlManagement = { .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24}, diff --git a/Projects/Benito/Descriptors.h b/Projects/Benito/Descriptors.h index fc47f6f10e..45bab84d97 100644 --- a/Projects/Benito/Descriptors.h +++ b/Projects/Benito/Descriptors.h @@ -68,7 +68,6 @@ USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Interface_t CDC_CCI_Interface; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_IntHeader; - CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_CallManagement; CDC_FUNCTIONAL_DESCRIPTOR(1) CDC_Functional_AbstractControlManagement; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Union; USB_Descriptor_Endpoint_t CDC_ManagementEndpoint; diff --git a/Projects/LEDNotifier/Descriptors.c b/Projects/LEDNotifier/Descriptors.c index 367fea3aaf..deef0876d5 100644 --- a/Projects/LEDNotifier/Descriptors.c +++ b/Projects/LEDNotifier/Descriptors.c @@ -122,14 +122,6 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .Data = {0x01, 0x10} }, - .CDC_Functional_CallManagement = - { - .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24}, - .SubType = 0x01, - - .Data = {0x03, 0x01} - }, - .CDC_Functional_AbstractControlManagement = { .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24}, diff --git a/Projects/LEDNotifier/Descriptors.h b/Projects/LEDNotifier/Descriptors.h index 2c56fa349a..76eb1fc243 100644 --- a/Projects/LEDNotifier/Descriptors.h +++ b/Projects/LEDNotifier/Descriptors.h @@ -68,7 +68,6 @@ USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Interface_t CDC_CCI_Interface; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_IntHeader; - CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_CallManagement; CDC_FUNCTIONAL_DESCRIPTOR(1) CDC_Functional_AbstractControlManagement; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Union; USB_Descriptor_Endpoint_t CDC_ManagementEndpoint; diff --git a/Projects/USBtoSerial/Descriptors.c b/Projects/USBtoSerial/Descriptors.c index 3a3e9f27bd..9343b92c0f 100644 --- a/Projects/USBtoSerial/Descriptors.c +++ b/Projects/USBtoSerial/Descriptors.c @@ -122,14 +122,6 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .Data = {0x01, 0x10} }, - .CDC_Functional_CallManagement = - { - .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24}, - .SubType = 0x01, - - .Data = {0x03, 0x01} - }, - .CDC_Functional_AbstractControlManagement = { .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24}, diff --git a/Projects/USBtoSerial/Descriptors.h b/Projects/USBtoSerial/Descriptors.h index fc47f6f10e..45bab84d97 100644 --- a/Projects/USBtoSerial/Descriptors.h +++ b/Projects/USBtoSerial/Descriptors.h @@ -68,7 +68,6 @@ USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Interface_t CDC_CCI_Interface; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_IntHeader; - CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_CallManagement; CDC_FUNCTIONAL_DESCRIPTOR(1) CDC_Functional_AbstractControlManagement; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Union; USB_Descriptor_Endpoint_t CDC_ManagementEndpoint; diff --git a/Projects/XPLAINBridge/USARTDescriptors.c b/Projects/XPLAINBridge/USARTDescriptors.c index d1158b232a..ca98b33a02 100644 --- 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} }, - .CDC_Functional_CallManagement = - { - .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24}, - .SubType = 0x01, - - .Data = {0x03, 0x01} - }, - .CDC_Functional_AbstractControlManagement = { .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24}, diff --git a/Projects/XPLAINBridge/USARTDescriptors.h b/Projects/XPLAINBridge/USARTDescriptors.h index a5e235cc05..b91530102e 100644 --- a/Projects/XPLAINBridge/USARTDescriptors.h +++ b/Projects/XPLAINBridge/USARTDescriptors.h @@ -68,7 +68,6 @@ USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Interface_t CDC_CCI_Interface; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_IntHeader; - CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_CallManagement; CDC_FUNCTIONAL_DESCRIPTOR(1) CDC_Functional_AbstractControlManagement; CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Union; USB_Descriptor_Endpoint_t CDC_ManagementEndpoint;