forked from mfulz_github/qmk_firmware
		
	Replace CDC interface numbers with enums.
This commit is contained in:
		
							parent
							
								
									ab238601b9
								
							
						
					
					
						commit
						352152c664
					
				| @ -123,8 +123,8 @@ const USB_Descriptor_Configuration_t ConfigurationDescriptor = | ||||
| 			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, | ||||
| 			.Subtype                = 0x06, | ||||
| 
 | ||||
| 			.MasterInterfaceNumber  = 0, | ||||
| 			.SlaveInterfaceNumber   = 1, | ||||
| 			.MasterInterfaceNumber  = INTERFACE_ID_CDC_CCI, | ||||
| 			.SlaveInterfaceNumber   = INTERFACE_ID_CDC_DCI, | ||||
| 		}, | ||||
| 
 | ||||
| 	.CDC_NotificationEndpoint = | ||||
|  | ||||
| @ -91,7 +91,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = | ||||
| 		{ | ||||
| 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation}, | ||||
| 
 | ||||
| 			.FirstInterfaceIndex    = 0, | ||||
| 			.FirstInterfaceIndex    = INTERFACE_ID_CDC1_CCI, | ||||
| 			.TotalInterfaces        = 2, | ||||
| 
 | ||||
| 			.Class                  = CDC_CSCP_CDCClass, | ||||
| @ -138,8 +138,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = | ||||
| 			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, | ||||
| 			.Subtype                = CDC_DSUBTYPE_CSInterface_Union, | ||||
| 
 | ||||
| 			.MasterInterfaceNumber  = 0, | ||||
| 			.SlaveInterfaceNumber   = 1, | ||||
| 			.MasterInterfaceNumber  = INTERFACE_ID_CDC1_CCI, | ||||
| 			.SlaveInterfaceNumber   = INTERFACE_ID_CDC1_DCI, | ||||
| 		}, | ||||
| 
 | ||||
| 	.CDC1_ManagementEndpoint = | ||||
| @ -192,7 +192,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = | ||||
| 		{ | ||||
| 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation}, | ||||
| 
 | ||||
| 			.FirstInterfaceIndex    = 2, | ||||
| 			.FirstInterfaceIndex    = INTERFACE_ID_CDC2_CCI, | ||||
| 			.TotalInterfaces        = 2, | ||||
| 
 | ||||
| 			.Class                  = CDC_CSCP_CDCClass, | ||||
| @ -239,8 +239,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = | ||||
| 			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, | ||||
| 			.Subtype                = CDC_DSUBTYPE_CSInterface_Union, | ||||
| 
 | ||||
| 			.MasterInterfaceNumber  = 2, | ||||
| 			.SlaveInterfaceNumber   = 3, | ||||
| 			.MasterInterfaceNumber  = INTERFACE_ID_CDC2_CCI, | ||||
| 			.SlaveInterfaceNumber   = INTERFACE_ID_CDC2_DCI, | ||||
| 		}, | ||||
| 
 | ||||
| 	.CDC2_ManagementEndpoint = | ||||
|  | ||||
| @ -123,8 +123,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = | ||||
| 			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, | ||||
| 			.Subtype                = CDC_DSUBTYPE_CSInterface_Union, | ||||
| 
 | ||||
| 			.MasterInterfaceNumber  = 0, | ||||
| 			.SlaveInterfaceNumber   = 1, | ||||
| 			.MasterInterfaceNumber  = INTERFACE_ID_CDC_CCI, | ||||
| 			.SlaveInterfaceNumber   = INTERFACE_ID_CDC_DCI, | ||||
| 		}, | ||||
| 
 | ||||
| 	.CDC_NotificationEndpoint = | ||||
|  | ||||
| @ -124,8 +124,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = | ||||
| 			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, | ||||
| 			.Subtype                = CDC_DSUBTYPE_CSInterface_Union, | ||||
| 
 | ||||
| 			.MasterInterfaceNumber  = 0, | ||||
| 			.SlaveInterfaceNumber   = 1, | ||||
| 			.MasterInterfaceNumber  = INTERFACE_ID_CDC_CCI, | ||||
| 			.SlaveInterfaceNumber   = INTERFACE_ID_CDC_DCI, | ||||
| 		}, | ||||
| 
 | ||||
| 	.CDC_NotificationEndpoint = | ||||
|  | ||||
| @ -91,7 +91,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = | ||||
| 		{ | ||||
| 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation}, | ||||
| 
 | ||||
| 			.FirstInterfaceIndex    = 0, | ||||
| 			.FirstInterfaceIndex    = INTERFACE_ID_CDC_CCI, | ||||
| 			.TotalInterfaces        = 2, | ||||
| 
 | ||||
| 			.Class                  = CDC_CSCP_CDCClass, | ||||
| @ -138,8 +138,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = | ||||
| 			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, | ||||
| 			.Subtype                = CDC_DSUBTYPE_CSInterface_Union, | ||||
| 
 | ||||
| 			.MasterInterfaceNumber  = 0, | ||||
| 			.SlaveInterfaceNumber   = 1, | ||||
| 			.MasterInterfaceNumber  = INTERFACE_ID_CDC_CCI, | ||||
| 			.SlaveInterfaceNumber   = INTERFACE_ID_CDC_DCI, | ||||
| 		}, | ||||
| 
 | ||||
| 	.CDC_NotificationEndpoint = | ||||
|  | ||||
| @ -110,7 +110,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = | ||||
| 		{ | ||||
| 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation}, | ||||
| 
 | ||||
| 			.FirstInterfaceIndex    = 0, | ||||
| 			.FirstInterfaceIndex    = INTERFACE_ID_CDC_CCI, | ||||
| 			.TotalInterfaces        = 2, | ||||
| 
 | ||||
| 			.Class                  = CDC_CSCP_CDCClass, | ||||
| @ -157,8 +157,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = | ||||
| 			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, | ||||
| 			.Subtype                = CDC_DSUBTYPE_CSInterface_Union, | ||||
| 
 | ||||
| 			.MasterInterfaceNumber  = 0, | ||||
| 			.SlaveInterfaceNumber   = 1, | ||||
| 			.MasterInterfaceNumber  = INTERFACE_ID_CDC_CCI, | ||||
| 			.SlaveInterfaceNumber   = INTERFACE_ID_CDC_DCI, | ||||
| 		}, | ||||
| 
 | ||||
| 	.CDC_NotificationEndpoint = | ||||
|  | ||||
| @ -91,7 +91,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = | ||||
| 		{ | ||||
| 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation}, | ||||
| 
 | ||||
| 			.FirstInterfaceIndex    = 0, | ||||
| 			.FirstInterfaceIndex    = INTERFACE_ID_CDC1_CCI, | ||||
| 			.TotalInterfaces        = 2, | ||||
| 
 | ||||
| 			.Class                  = CDC_CSCP_CDCClass, | ||||
| @ -138,8 +138,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = | ||||
| 			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, | ||||
| 			.Subtype                = CDC_DSUBTYPE_CSInterface_Union, | ||||
| 
 | ||||
| 			.MasterInterfaceNumber  = 0, | ||||
| 			.SlaveInterfaceNumber   = 1, | ||||
| 			.MasterInterfaceNumber  = INTERFACE_ID_CDC1_CCI, | ||||
| 			.SlaveInterfaceNumber   = INTERFACE_ID_CDC1_DCI, | ||||
| 		}, | ||||
| 
 | ||||
| 	.CDC1_ManagementEndpoint = | ||||
| @ -192,7 +192,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = | ||||
| 		{ | ||||
| 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation}, | ||||
| 
 | ||||
| 			.FirstInterfaceIndex    = 2, | ||||
| 			.FirstInterfaceIndex    = INTERFACE_ID_CDC2_CCI, | ||||
| 			.TotalInterfaces        = 2, | ||||
| 
 | ||||
| 			.Class                  = CDC_CSCP_CDCClass, | ||||
| @ -239,8 +239,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = | ||||
| 			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, | ||||
| 			.Subtype                = CDC_DSUBTYPE_CSInterface_Union, | ||||
| 
 | ||||
| 			.MasterInterfaceNumber  = 2, | ||||
| 			.SlaveInterfaceNumber   = 3, | ||||
| 			.MasterInterfaceNumber  = INTERFACE_ID_CDC2_CCI, | ||||
| 			.SlaveInterfaceNumber   = INTERFACE_ID_CDC2_DCI, | ||||
| 		}, | ||||
| 
 | ||||
| 	.CDC2_ManagementEndpoint = | ||||
|  | ||||
| @ -123,8 +123,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = | ||||
| 			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, | ||||
| 			.Subtype                = CDC_DSUBTYPE_CSInterface_Union, | ||||
| 
 | ||||
| 			.MasterInterfaceNumber  = 0, | ||||
| 			.SlaveInterfaceNumber   = 1, | ||||
| 			.MasterInterfaceNumber  = INTERFACE_ID_CDC_CCI, | ||||
| 			.SlaveInterfaceNumber   = INTERFACE_ID_CDC_DCI, | ||||
| 		}, | ||||
| 
 | ||||
| 	.CDC_NotificationEndpoint = | ||||
|  | ||||
| @ -124,8 +124,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = | ||||
| 			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, | ||||
| 			.Subtype                = CDC_DSUBTYPE_CSInterface_Union, | ||||
| 
 | ||||
| 			.MasterInterfaceNumber  = 0, | ||||
| 			.SlaveInterfaceNumber   = 1, | ||||
| 			.MasterInterfaceNumber  = INTERFACE_ID_CDC_CCI, | ||||
| 			.SlaveInterfaceNumber   = INTERFACE_ID_CDC_DCI, | ||||
| 		}, | ||||
| 
 | ||||
| 	.CDC_NotificationEndpoint = | ||||
|  | ||||
| @ -123,8 +123,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = | ||||
| 			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, | ||||
| 			.Subtype                = CDC_DSUBTYPE_CSInterface_Union, | ||||
| 
 | ||||
| 			.MasterInterfaceNumber  = 0, | ||||
| 			.SlaveInterfaceNumber   = 1, | ||||
| 			.MasterInterfaceNumber  = INTERFACE_ID_CDC_CCI, | ||||
| 			.SlaveInterfaceNumber   = INTERFACE_ID_CDC_DCI, | ||||
| 		}, | ||||
| 
 | ||||
| 	.CDC_NotificationEndpoint = | ||||
|  | ||||
| @ -124,8 +124,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = | ||||
| 			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, | ||||
| 			.Subtype                = CDC_DSUBTYPE_CSInterface_Union, | ||||
| 
 | ||||
| 			.MasterInterfaceNumber  = 0, | ||||
| 			.SlaveInterfaceNumber   = 1, | ||||
| 			.MasterInterfaceNumber  = INTERFACE_ID_CDC_CCI, | ||||
| 			.SlaveInterfaceNumber   = INTERFACE_ID_CDC_DCI, | ||||
| 		}, | ||||
| 
 | ||||
| 	.CDC_NotificationEndpoint = | ||||
|  | ||||
| @ -136,8 +136,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = | ||||
| 			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, | ||||
| 			.Subtype                = CDC_DSUBTYPE_CSInterface_Union, | ||||
| 
 | ||||
| 			.MasterInterfaceNumber  = 0, | ||||
| 			.SlaveInterfaceNumber   = 1, | ||||
| 			.MasterInterfaceNumber  = INTERFACE_ID_CDC_CCI, | ||||
| 			.SlaveInterfaceNumber   = INTERFACE_ID_CDC_DCI, | ||||
| 		}, | ||||
| 
 | ||||
| 	.CDC_NotificationEndpoint = | ||||
|  | ||||
| @ -124,8 +124,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = | ||||
| 			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, | ||||
| 			.Subtype                = CDC_DSUBTYPE_CSInterface_Union, | ||||
| 
 | ||||
| 			.MasterInterfaceNumber  = 0, | ||||
| 			.SlaveInterfaceNumber   = 1, | ||||
| 			.MasterInterfaceNumber  = INTERFACE_ID_CDC_CCI, | ||||
| 			.SlaveInterfaceNumber   = INTERFACE_ID_CDC_DCI, | ||||
| 		}, | ||||
| 
 | ||||
| 	.CDC_NotificationEndpoint = | ||||
|  | ||||
| @ -91,7 +91,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = | ||||
| 		{ | ||||
| 			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation}, | ||||
| 
 | ||||
| 			.FirstInterfaceIndex    = 0, | ||||
| 			.FirstInterfaceIndex    = INTERFACE_ID_CDC_CCI, | ||||
| 			.TotalInterfaces        = 2, | ||||
| 
 | ||||
| 			.Class                  = CDC_CSCP_CDCClass, | ||||
| @ -138,8 +138,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = | ||||
| 			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, | ||||
| 			.Subtype                = CDC_DSUBTYPE_CSInterface_Union, | ||||
| 
 | ||||
| 			.MasterInterfaceNumber  = 0, | ||||
| 			.SlaveInterfaceNumber   = 1, | ||||
| 			.MasterInterfaceNumber  = INTERFACE_ID_CDC_CCI, | ||||
| 			.SlaveInterfaceNumber   = INTERFACE_ID_CDC_DCI, | ||||
| 		}, | ||||
| 
 | ||||
| 	.CDC_NotificationEndpoint = | ||||
|  | ||||
| @ -124,8 +124,8 @@ const USART_USB_Descriptor_Configuration_t PROGMEM USART_ConfigurationDescriptor | ||||
| 			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, | ||||
| 			.Subtype                = CDC_DSUBTYPE_CSInterface_Union, | ||||
| 
 | ||||
| 			.MasterInterfaceNumber  = 0, | ||||
| 			.SlaveInterfaceNumber   = 1, | ||||
| 			.MasterInterfaceNumber  = INTERFACE_ID_CDC_CCI, | ||||
| 			.SlaveInterfaceNumber   = INTERFACE_ID_CDC_DCI, | ||||
| 		}, | ||||
| 
 | ||||
| 	.CDC_NotificationEndpoint = | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 László Monda
						László Monda