diff options
| author | László Monda <laci@monda.hu> | 2013-10-06 22:16:20 +0200 |
|---|---|---|
| committer | László Monda <laci@monda.hu> | 2013-10-06 22:16:20 +0200 |
| commit | 9ef29ea2293dde7225360fe258224d22d3a68756 (patch) | |
| tree | 8b97bebc31be97f73384a605ccc2f41b2a04d492 /Projects/Magstripe | |
| parent | cd3aae87daa243413413ab9fc4e32c225c3bea03 (diff) | |
| download | lufa-9ef29ea2293dde7225360fe258224d22d3a68756.tar.gz lufa-9ef29ea2293dde7225360fe258224d22d3a68756.tar.bz2 lufa-9ef29ea2293dde7225360fe258224d22d3a68756.zip | |
Extract interface numbers into enums.
Diffstat (limited to 'Projects/Magstripe')
| -rw-r--r-- | Projects/Magstripe/Descriptors.c | 2 | ||||
| -rw-r--r-- | Projects/Magstripe/Descriptors.h | 17 | ||||
| -rw-r--r-- | Projects/Magstripe/Magstripe.c | 2 |
3 files changed, 15 insertions, 6 deletions
diff --git a/Projects/Magstripe/Descriptors.c b/Projects/Magstripe/Descriptors.c index 680944092..c707c1cf6 100644 --- a/Projects/Magstripe/Descriptors.c +++ b/Projects/Magstripe/Descriptors.c @@ -105,7 +105,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = { .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, - .InterfaceNumber = 0x00, + .InterfaceNumber = INTERFACE_ID_Keyboard, .AlternateSetting = 0x00, .TotalEndpoints = 1, diff --git a/Projects/Magstripe/Descriptors.h b/Projects/Magstripe/Descriptors.h index 0f4869fb7..46218fc2c 100644 --- a/Projects/Magstripe/Descriptors.h +++ b/Projects/Magstripe/Descriptors.h @@ -56,18 +56,27 @@ // Keyboard HID Interface USB_Descriptor_Interface_t HID_Interface; /**< Keyboard interface descriptor */ USB_HID_Descriptor_HID_t HID_KeyboardHID; /**< Keyboard HID descriptor */ - USB_Descriptor_Endpoint_t HID_ReportINEndpoint; /**< Keyboard key report endpoint descriptor */ + USB_Descriptor_Endpoint_t HID_ReportINEndpoint; /**< Keyboard key report endpoint descriptor */ } 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_Keyboard = 0, /**< Keyboard 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 */ }; /* Macros: */ diff --git a/Projects/Magstripe/Magstripe.c b/Projects/Magstripe/Magstripe.c index 8dba7370b..a0b6f1b01 100644 --- a/Projects/Magstripe/Magstripe.c +++ b/Projects/Magstripe/Magstripe.c @@ -56,7 +56,7 @@ USB_ClassInfo_HID_Device_t Keyboard_HID_Interface = { .Config = { - .InterfaceNumber = 0, + .InterfaceNumber = INTERFACE_ID_Keyboard, .ReportINEndpoint = { .Address = KEYBOARD_EPADDR, |