diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2013-10-06 13:22:23 -0700 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2013-10-06 13:22:23 -0700 |
| commit | 7ce4d35c3909e0b55d0a184c3d9b2b8cb35b0131 (patch) | |
| tree | 3abbab4d1860ea31d30d7a72496fc9959fecb858 /Bootloaders/CDC | |
| parent | 8e2476a125d6a4bd0385eb0f9569ac597bdbf9ed (diff) | |
| parent | 9ef29ea2293dde7225360fe258224d22d3a68756 (diff) | |
| download | lufa-7ce4d35c3909e0b55d0a184c3d9b2b8cb35b0131.tar.gz lufa-7ce4d35c3909e0b55d0a184c3d9b2b8cb35b0131.tar.bz2 lufa-7ce4d35c3909e0b55d0a184c3d9b2b8cb35b0131.zip | |
Merge pull request #8 from mondalaci/extract-interface-numbers
Extract interface numbers into enums.
Diffstat (limited to 'Bootloaders/CDC')
| -rw-r--r-- | Bootloaders/CDC/Descriptors.c | 4 | ||||
| -rw-r--r-- | Bootloaders/CDC/Descriptors.h | 16 |
2 files changed, 15 insertions, 5 deletions
diff --git a/Bootloaders/CDC/Descriptors.c b/Bootloaders/CDC/Descriptors.c index bbf4e7621..2b85b0126 100644 --- a/Bootloaders/CDC/Descriptors.c +++ b/Bootloaders/CDC/Descriptors.c @@ -90,7 +90,7 @@ const USB_Descriptor_Configuration_t ConfigurationDescriptor = { .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, - .InterfaceNumber = 0, + .InterfaceNumber = INTERFACE_ID_CDC_CCI, .AlternateSetting = 0, .TotalEndpoints = 1, @@ -141,7 +141,7 @@ const USB_Descriptor_Configuration_t ConfigurationDescriptor = { .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, - .InterfaceNumber = 1, + .InterfaceNumber = INTERFACE_ID_CDC_DCI, .AlternateSetting = 0, .TotalEndpoints = 2, diff --git a/Bootloaders/CDC/Descriptors.h b/Bootloaders/CDC/Descriptors.h index 24d1a398e..f35a4d1f8 100644 --- a/Bootloaders/CDC/Descriptors.h +++ b/Bootloaders/CDC/Descriptors.h @@ -127,15 +127,25 @@ USB_Descriptor_Endpoint_t CDC_DataInEndpoint; } USB_Descriptor_Configuration_t; + /** Enum for the device interface descriptor IDs within the device. Each interface descriptor + * should have a unique ID index associated with it, which can be used to refer to the + * interface from other descriptors. + */ + enum InterfaceDescriptors_t + { + INTERFACE_ID_CDC_CCI = 0, /**< CDC CCI interface descriptor ID */ + INTERFACE_ID_CDC_DCI = 1, /**< CDC DCI interface descriptor ID */ + }; + /** Enum for the device string descriptor IDs within the device. Each string descriptor should * have a unique ID index associated with it, which can be used to refer to the string from * other descriptors. */ enum StringDescriptors_t { - STRING_ID_Language = 0, /**< Supported Languages string descriptor ID (must be zero) */ - STRING_ID_Manufacturer = 1, /**< Manufacturer string ID */ - STRING_ID_Product = 2, /**< Product string ID */ + STRING_ID_Language = 0, /**< Supported Languages string descriptor ID (must be zero) */ + STRING_ID_Manufacturer = 1, /**< Manufacturer string ID */ + STRING_ID_Product = 2, /**< Product string ID */ }; /* Function Prototypes: */ |