forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace CDC interface numbers with enums.

Browse Source
pull/1469/head
László Monda 11 years ago
parent ab238601b9
commit 352152c664
25 changed files with 233 additions and 233 deletions
Show Stats Download Patch File Download Diff File

4
Bootloaders/CDC/Descriptors.c
Unescape View File

@ -123,8 +123,8 @@ const USB_Descriptor_Configuration_t ConfigurationDescriptor =
.Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
.Subtype = 0x06, .Subtype = 0x06,
.MasterInterfaceNumber = 0, .MasterInterfaceNumber = INTERFACE_ID_CDC_CCI,
.SlaveInterfaceNumber = 1, .SlaveInterfaceNumber = INTERFACE_ID_CDC_DCI,
}, },
.CDC_NotificationEndpoint = .CDC_NotificationEndpoint =

12
Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.c
Unescape View File

@ -91,7 +91,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{ {
.Header = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation}, .Header = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},
.FirstInterfaceIndex = 0, .FirstInterfaceIndex = INTERFACE_ID_CDC1_CCI,
.TotalInterfaces = 2, .TotalInterfaces = 2,
.Class = CDC_CSCP_CDCClass, .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}, .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
.Subtype = CDC_DSUBTYPE_CSInterface_Union, .Subtype = CDC_DSUBTYPE_CSInterface_Union,
.MasterInterfaceNumber = 0, .MasterInterfaceNumber = INTERFACE_ID_CDC1_CCI,
.SlaveInterfaceNumber = 1, .SlaveInterfaceNumber = INTERFACE_ID_CDC1_DCI,
}, },
.CDC1_ManagementEndpoint = .CDC1_ManagementEndpoint =
@ -192,7 +192,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{ {
.Header = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation}, .Header = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},
.FirstInterfaceIndex = 2, .FirstInterfaceIndex = INTERFACE_ID_CDC2_CCI,
.TotalInterfaces = 2, .TotalInterfaces = 2,
.Class = CDC_CSCP_CDCClass, .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}, .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
.Subtype = CDC_DSUBTYPE_CSInterface_Union, .Subtype = CDC_DSUBTYPE_CSInterface_Union,
.MasterInterfaceNumber = 2, .MasterInterfaceNumber = INTERFACE_ID_CDC2_CCI,
.SlaveInterfaceNumber = 3, .SlaveInterfaceNumber = INTERFACE_ID_CDC2_DCI,
}, },
.CDC2_ManagementEndpoint = .CDC2_ManagementEndpoint =

4
Demos/Device/ClassDriver/RNDISEthernet/Descriptors.c
Unescape View File

@ -123,8 +123,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
.Subtype = CDC_DSUBTYPE_CSInterface_Union, .Subtype = CDC_DSUBTYPE_CSInterface_Union,
.MasterInterfaceNumber = 0, .MasterInterfaceNumber = INTERFACE_ID_CDC_CCI,
.SlaveInterfaceNumber = 1, .SlaveInterfaceNumber = INTERFACE_ID_CDC_DCI,
}, },
.CDC_NotificationEndpoint = .CDC_NotificationEndpoint =

4
Demos/Device/ClassDriver/VirtualSerial/Descriptors.c
Unescape View File

@ -124,8 +124,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
.Subtype = CDC_DSUBTYPE_CSInterface_Union, .Subtype = CDC_DSUBTYPE_CSInterface_Union,
.MasterInterfaceNumber = 0, .MasterInterfaceNumber = INTERFACE_ID_CDC_CCI,
.SlaveInterfaceNumber = 1, .SlaveInterfaceNumber = INTERFACE_ID_CDC_DCI,
}, },
.CDC_NotificationEndpoint = .CDC_NotificationEndpoint =

6
Demos/Device/ClassDriver/VirtualSerialMassStorage/Descriptors.c
Unescape View File

@ -91,7 +91,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{ {
.Header = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation}, .Header = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},
.FirstInterfaceIndex = 0, .FirstInterfaceIndex = INTERFACE_ID_CDC_CCI,
.TotalInterfaces = 2, .TotalInterfaces = 2,
.Class = CDC_CSCP_CDCClass, .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}, .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
.Subtype = CDC_DSUBTYPE_CSInterface_Union, .Subtype = CDC_DSUBTYPE_CSInterface_Union,
.MasterInterfaceNumber = 0, .MasterInterfaceNumber = INTERFACE_ID_CDC_CCI,
.SlaveInterfaceNumber = 1, .SlaveInterfaceNumber = INTERFACE_ID_CDC_DCI,
}, },
.CDC_NotificationEndpoint = .CDC_NotificationEndpoint =

6
Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c
Unescape View File

@ -110,7 +110,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{ {
.Header = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation}, .Header = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},
.FirstInterfaceIndex = 0, .FirstInterfaceIndex = INTERFACE_ID_CDC_CCI,
.TotalInterfaces = 2, .TotalInterfaces = 2,
.Class = CDC_CSCP_CDCClass, .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}, .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
.Subtype = CDC_DSUBTYPE_CSInterface_Union, .Subtype = CDC_DSUBTYPE_CSInterface_Union,
.MasterInterfaceNumber = 0, .MasterInterfaceNumber = INTERFACE_ID_CDC_CCI,
.SlaveInterfaceNumber = 1, .SlaveInterfaceNumber = INTERFACE_ID_CDC_DCI,
}, },
.CDC_NotificationEndpoint = .CDC_NotificationEndpoint =

12
Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c
Unescape View File

@ -91,7 +91,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{ {
.Header = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation}, .Header = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},
.FirstInterfaceIndex = 0, .FirstInterfaceIndex = INTERFACE_ID_CDC1_CCI,
.TotalInterfaces = 2, .TotalInterfaces = 2,
.Class = CDC_CSCP_CDCClass, .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}, .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
.Subtype = CDC_DSUBTYPE_CSInterface_Union, .Subtype = CDC_DSUBTYPE_CSInterface_Union,
.MasterInterfaceNumber = 0, .MasterInterfaceNumber = INTERFACE_ID_CDC1_CCI,
.SlaveInterfaceNumber = 1, .SlaveInterfaceNumber = INTERFACE_ID_CDC1_DCI,
}, },
.CDC1_ManagementEndpoint = .CDC1_ManagementEndpoint =
@ -192,7 +192,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{ {
.Header = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation}, .Header = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},
.FirstInterfaceIndex = 2, .FirstInterfaceIndex = INTERFACE_ID_CDC2_CCI,
.TotalInterfaces = 2, .TotalInterfaces = 2,
.Class = CDC_CSCP_CDCClass, .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}, .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
.Subtype = CDC_DSUBTYPE_CSInterface_Union, .Subtype = CDC_DSUBTYPE_CSInterface_Union,
.MasterInterfaceNumber = 2, .MasterInterfaceNumber = INTERFACE_ID_CDC2_CCI,
.SlaveInterfaceNumber = 3, .SlaveInterfaceNumber = INTERFACE_ID_CDC2_DCI,
}, },
.CDC2_ManagementEndpoint = .CDC2_ManagementEndpoint =

4
Demos/Device/LowLevel/RNDISEthernet/Descriptors.c
Unescape View File

@ -123,8 +123,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
.Subtype = CDC_DSUBTYPE_CSInterface_Union, .Subtype = CDC_DSUBTYPE_CSInterface_Union,
.MasterInterfaceNumber = 0, .MasterInterfaceNumber = INTERFACE_ID_CDC_CCI,
.SlaveInterfaceNumber = 1, .SlaveInterfaceNumber = INTERFACE_ID_CDC_DCI,
}, },
.CDC_NotificationEndpoint = .CDC_NotificationEndpoint =

4
Demos/Device/LowLevel/VirtualSerial/Descriptors.c
Unescape View File

@ -124,8 +124,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
.Subtype = CDC_DSUBTYPE_CSInterface_Union, .Subtype = CDC_DSUBTYPE_CSInterface_Union,
.MasterInterfaceNumber = 0, .MasterInterfaceNumber = INTERFACE_ID_CDC_CCI,
.SlaveInterfaceNumber = 1, .SlaveInterfaceNumber = INTERFACE_ID_CDC_DCI,
}, },
.CDC_NotificationEndpoint = .CDC_NotificationEndpoint =

4
Projects/Benito/Descriptors.c
Unescape View File

@ -123,8 +123,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
.Subtype = CDC_DSUBTYPE_CSInterface_Union, .Subtype = CDC_DSUBTYPE_CSInterface_Union,
.MasterInterfaceNumber = 0, .MasterInterfaceNumber = INTERFACE_ID_CDC_CCI,
.SlaveInterfaceNumber = 1, .SlaveInterfaceNumber = INTERFACE_ID_CDC_DCI,
}, },
.CDC_NotificationEndpoint = .CDC_NotificationEndpoint =

4
Projects/LEDNotifier/Descriptors.c
Unescape View File

@ -124,8 +124,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
.Subtype = CDC_DSUBTYPE_CSInterface_Union, .Subtype = CDC_DSUBTYPE_CSInterface_Union,
.MasterInterfaceNumber = 0, .MasterInterfaceNumber = INTERFACE_ID_CDC_CCI,
.SlaveInterfaceNumber = 1, .SlaveInterfaceNumber = INTERFACE_ID_CDC_DCI,
}, },
.CDC_NotificationEndpoint = .CDC_NotificationEndpoint =

4
Projects/SerialToLCD/Descriptors.c
Unescape View File

@ -136,8 +136,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
.Subtype = CDC_DSUBTYPE_CSInterface_Union, .Subtype = CDC_DSUBTYPE_CSInterface_Union,
.MasterInterfaceNumber = 0, .MasterInterfaceNumber = INTERFACE_ID_CDC_CCI,
.SlaveInterfaceNumber = 1, .SlaveInterfaceNumber = INTERFACE_ID_CDC_DCI,
}, },
.CDC_NotificationEndpoint = .CDC_NotificationEndpoint =

4
Projects/USBtoSerial/Descriptors.c
Unescape View File

@ -124,8 +124,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
.Subtype = CDC_DSUBTYPE_CSInterface_Union, .Subtype = CDC_DSUBTYPE_CSInterface_Union,
.MasterInterfaceNumber = 0, .MasterInterfaceNumber = INTERFACE_ID_CDC_CCI,
.SlaveInterfaceNumber = 1, .SlaveInterfaceNumber = INTERFACE_ID_CDC_DCI,
}, },
.CDC_NotificationEndpoint = .CDC_NotificationEndpoint =

6
Projects/Webserver/Descriptors.c
Unescape View File

@ -91,7 +91,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
{ {
.Header = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation}, .Header = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},
.FirstInterfaceIndex = 0, .FirstInterfaceIndex = INTERFACE_ID_CDC_CCI,
.TotalInterfaces = 2, .TotalInterfaces = 2,
.Class = CDC_CSCP_CDCClass, .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}, .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
.Subtype = CDC_DSUBTYPE_CSInterface_Union, .Subtype = CDC_DSUBTYPE_CSInterface_Union,
.MasterInterfaceNumber = 0, .MasterInterfaceNumber = INTERFACE_ID_CDC_CCI,
.SlaveInterfaceNumber = 1, .SlaveInterfaceNumber = INTERFACE_ID_CDC_DCI,
}, },
.CDC_NotificationEndpoint = .CDC_NotificationEndpoint =

4
Projects/XPLAINBridge/USARTDescriptors.c
Unescape View File

@ -124,8 +124,8 @@ const USART_USB_Descriptor_Configuration_t PROGMEM USART_ConfigurationDescriptor
.Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface}, .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
.Subtype = CDC_DSUBTYPE_CSInterface_Union, .Subtype = CDC_DSUBTYPE_CSInterface_Union,
.MasterInterfaceNumber = 0, .MasterInterfaceNumber = INTERFACE_ID_CDC_CCI,
.SlaveInterfaceNumber = 1, .SlaveInterfaceNumber = INTERFACE_ID_CDC_DCI,
}, },
.CDC_NotificationEndpoint = .CDC_NotificationEndpoint =

Write Preview
Loading…
Cancel
Save