diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-09-28 13:27:19 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-09-28 13:27:19 +0000 |
| commit | b2a30cd48a0621b360d23dd430c646d22e943d09 (patch) | |
| tree | 99cea070a86b80281a4f4c0d45b3fb3c776528b0 /Bootloaders/DFU | |
| parent | 713670043a1edb714461fc83c2b8817f3db99961 (diff) | |
| download | lufa-b2a30cd48a0621b360d23dd430c646d22e943d09.tar.gz lufa-b2a30cd48a0621b360d23dd430c646d22e943d09.tar.bz2 lufa-b2a30cd48a0621b360d23dd430c646d22e943d09.zip | |
Added CDC functional descriptor structs to the Low Level CDC demos and CDC class bootloader, to improve the readability of the descriptors.
Fixed BootloaderCDC project failing on some operating systems due to removed Line Encoding options (thanks to Alexey Belyaev).
Diffstat (limited to 'Bootloaders/DFU')
| -rw-r--r-- | Bootloaders/DFU/Descriptors.c | 2 | ||||
| -rw-r--r-- | Bootloaders/DFU/Descriptors.h | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/Bootloaders/DFU/Descriptors.c b/Bootloaders/DFU/Descriptors.c index ad4e06a92..8db65310a 100644 --- a/Bootloaders/DFU/Descriptors.c +++ b/Bootloaders/DFU/Descriptors.c @@ -104,7 +104,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor = .DFU_Functional = { - .Header = {.Size = sizeof(USB_DFU_Functional_Descriptor_t), .Type = DTYPE_DFUFunctional}, + .Header = {.Size = sizeof(USB_Descriptor_DFU_Functional_t), .Type = DTYPE_DFUFunctional}, .Attributes = (ATTR_CAN_UPLOAD | ATTR_CAN_DOWNLOAD), diff --git a/Bootloaders/DFU/Descriptors.h b/Bootloaders/DFU/Descriptors.h index 133d8fb98..5b38e60fc 100644 --- a/Bootloaders/DFU/Descriptors.h +++ b/Bootloaders/DFU/Descriptors.h @@ -140,19 +140,19 @@ USB_Descriptor_Header_t Header; /**< Standard descriptor header structure */ uint8_t Attributes; /**< DFU device attributes, a mask comprising of the - * ATTR_* macros listed in this source file - */ + * ATTR_* macros listed in this source file + */ uint16_t DetachTimeout; /**< Timeout in milliseconds between a USB_DETACH - * command being issued and the device detaching - * from the USB bus - */ + * command being issued and the device detaching + * from the USB bus + */ uint16_t TransferSize; /**< Maximum number of bytes the DFU device can accept - * from the host in a transaction - */ + * from the host in a transaction + */ uint16_t DFUSpecification; /**< BCD packed DFU specification number this DFU - * device complies with - */ - } USB_DFU_Functional_Descriptor_t; + * device complies with + */ + } USB_Descriptor_DFU_Functional_t; /** Type define for the device configuration descriptor structure. This must be defined in the * application code, as the configuration descriptor contains several sub-descriptors which @@ -162,7 +162,7 @@ { USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Interface_t DFU_Interface; - USB_DFU_Functional_Descriptor_t DFU_Functional; + USB_Descriptor_DFU_Functional_t DFU_Functional; } USB_Descriptor_Configuration_t; /* Function Prototypes: */ |