diff options
| author | László Monda <laci@monda.hu> | 2013-10-10 00:32:35 +0200 |
|---|---|---|
| committer | László Monda <laci@monda.hu> | 2013-10-10 00:32:35 +0200 |
| commit | 352152c66433f1c317cd48529b2746be79fd17f5 (patch) | |
| tree | 846d62348b643565eb37c928044dfac40c483740 /Bootloaders | |
| parent | ab238601b96e4d804640ccfef5a9bde51995da7f (diff) | |
| download | lufa-352152c66433f1c317cd48529b2746be79fd17f5.tar.gz lufa-352152c66433f1c317cd48529b2746be79fd17f5.tar.bz2 lufa-352152c66433f1c317cd48529b2746be79fd17f5.zip | |
Replace CDC interface numbers with enums.
Diffstat (limited to 'Bootloaders')
| -rw-r--r-- | Bootloaders/CDC/Descriptors.c | 4 | ||||
| -rw-r--r-- | Bootloaders/HID/Descriptors.c | 12 | ||||
| -rw-r--r-- | Bootloaders/Printer/Descriptors.h | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/Bootloaders/CDC/Descriptors.c b/Bootloaders/CDC/Descriptors.c index 2b85b0126..5bcc4e7a3 100644 --- a/Bootloaders/CDC/Descriptors.c +++ b/Bootloaders/CDC/Descriptors.c @@ -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 = diff --git a/Bootloaders/HID/Descriptors.c b/Bootloaders/HID/Descriptors.c index 6754d81d4..a243d8d4b 100644 --- a/Bootloaders/HID/Descriptors.c +++ b/Bootloaders/HID/Descriptors.c @@ -48,12 +48,12 @@ const USB_Descriptor_HIDReport_Datatype_t HIDReport[] = HID_RI_USAGE_PAGE(16, 0xFFDC), /* Vendor Page 0xDC */ HID_RI_USAGE(8, 0xFB), /* Vendor Usage 0xFB */ HID_RI_COLLECTION(8, 0x01), /* Vendor Usage 1 */ - HID_RI_USAGE(8, 0x02), /* Vendor Usage 2 */ - HID_RI_LOGICAL_MINIMUM(8, 0x00), - HID_RI_LOGICAL_MAXIMUM(8, 0xFF), - HID_RI_REPORT_SIZE(8, 0x08), - HID_RI_REPORT_COUNT(16, (sizeof(uint16_t) + SPM_PAGESIZE)), - HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE), + HID_RI_USAGE(8, 0x02), /* Vendor Usage 2 */ + HID_RI_LOGICAL_MINIMUM(8, 0x00), + HID_RI_LOGICAL_MAXIMUM(8, 0xFF), + HID_RI_REPORT_SIZE(8, 0x08), + HID_RI_REPORT_COUNT(16, (sizeof(uint16_t) + SPM_PAGESIZE)), + HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE), HID_RI_END_COLLECTION(0), }; diff --git a/Bootloaders/Printer/Descriptors.h b/Bootloaders/Printer/Descriptors.h index d5c9b71ee..24710bf0b 100644 --- a/Bootloaders/Printer/Descriptors.h +++ b/Bootloaders/Printer/Descriptors.h @@ -72,7 +72,7 @@ */ enum InterfaceDescriptors_t { - INTERFACE_ID_Printer = 0, /**< Printer interface descriptor ID */ + INTERFACE_ID_Printer = 0, /**< Printer interface descriptor ID */ }; /** Enum for the device string descriptor IDs within the device. Each string descriptor should |