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/MassStorage | |
| 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/MassStorage')
| -rw-r--r-- | Bootloaders/MassStorage/BootloaderMassStorage.c | 2 | ||||
| -rw-r--r-- | Bootloaders/MassStorage/Descriptors.c | 2 | ||||
| -rw-r--r-- | Bootloaders/MassStorage/Descriptors.h | 10 |
3 files changed, 12 insertions, 2 deletions
diff --git a/Bootloaders/MassStorage/BootloaderMassStorage.c b/Bootloaders/MassStorage/BootloaderMassStorage.c index 1b6eda438..9d15a81af 100644 --- a/Bootloaders/MassStorage/BootloaderMassStorage.c +++ b/Bootloaders/MassStorage/BootloaderMassStorage.c @@ -44,7 +44,7 @@ USB_ClassInfo_MS_Device_t Disk_MS_Interface = { .Config = { - .InterfaceNumber = 0, + .InterfaceNumber = INTERFACE_ID_MassStorage, .DataINEndpoint = { .Address = MASS_STORAGE_IN_EPADDR, diff --git a/Bootloaders/MassStorage/Descriptors.c b/Bootloaders/MassStorage/Descriptors.c index 7ae0a7da9..1186ea079 100644 --- a/Bootloaders/MassStorage/Descriptors.c +++ b/Bootloaders/MassStorage/Descriptors.c @@ -91,7 +91,7 @@ const USB_Descriptor_Configuration_t ConfigurationDescriptor = { .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, - .InterfaceNumber = 0, + .InterfaceNumber = INTERFACE_ID_MassStorage, .AlternateSetting = 0, .TotalEndpoints = 2, diff --git a/Bootloaders/MassStorage/Descriptors.h b/Bootloaders/MassStorage/Descriptors.h index 2e97c6d8a..ea89cb27b 100644 --- a/Bootloaders/MassStorage/Descriptors.h +++ b/Bootloaders/MassStorage/Descriptors.h @@ -68,6 +68,16 @@ USB_Descriptor_Endpoint_t MS_DataOutEndpoint; } 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_MassStorage = 0, /**< Mass storage interface descriptor ID */ + }; + /* Function Prototypes: */ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, |