Remove incorrect Abstract Call Management class specific descriptor from the CDC demos, bootloaders and projects.

14 files changed, 1 insertions, 82 deletions

diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.c b/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.c
index b9bc4b112..18cd906c4 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 532c266a4..89a8855ad 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 5d5400d53..0e08d57fe 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 a5e351725..6a6577646 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 4d513cc50..4d85c4f00 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 2c56fa349..76eb1fc24 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 c55aa0c0c..e4d724b5a 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 c754dbe07..edc4ccea4 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 d9b154ddb..fedf3dd48 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 b8ebd0a4f..c659ad81c 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 b25b5d2ba..ff3dcccb0 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 02450490b..1840669f2 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 ff2ebf2e9..56385d467 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 5610854d2..8866752db 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;