projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Standardized the naming scheme given to configuration descriptor sub-elements in...
[pub/USBasp.git]
/
Demos
/
Device
/
LowLevel
/
DualVirtualSerial
/
Descriptors.c
diff --git
a/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c
b/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c
index
bd8ec1d
..
d9b154d
100644
(file)
--- a/
Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c
+++ b/
Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c
@@
-98,7
+98,7
@@
USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)
\r
},
\r
\r
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)
\r
},
\r
\r
- .
IAD1
=
\r
+ .
CDC1_IAD
=
\r
{
\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},
\r
\r
{
\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},
\r
\r
@@
-206,7
+206,7
@@
USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.PollingIntervalMS = 0x00
\r
},
\r
\r
.PollingIntervalMS = 0x00
\r
},
\r
\r
- .
IAD2
=
\r
+ .
CDC2_IAD
=
\r
{
\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},
\r
\r
{
\r
.Header = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},
\r
\r