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 /Bootloaders/Printer | |
| parent | cd3aae87daa243413413ab9fc4e32c225c3bea03 (diff) | |
| download | lufa-9ef29ea2293dde7225360fe258224d22d3a68756.tar.gz lufa-9ef29ea2293dde7225360fe258224d22d3a68756.tar.bz2 lufa-9ef29ea2293dde7225360fe258224d22d3a68756.zip | |
Extract interface numbers into enums.
Diffstat (limited to 'Bootloaders/Printer')
| -rw-r--r-- | Bootloaders/Printer/BootloaderPrinter.c | 2 | ||||
| -rw-r--r-- | Bootloaders/Printer/Descriptors.c | 2 | ||||
| -rw-r--r-- | Bootloaders/Printer/Descriptors.h | 15 |
3 files changed, 14 insertions, 5 deletions
diff --git a/Bootloaders/Printer/BootloaderPrinter.c b/Bootloaders/Printer/BootloaderPrinter.c index 1e60cdd6d..3fec7217d 100644 --- a/Bootloaders/Printer/BootloaderPrinter.c +++ b/Bootloaders/Printer/BootloaderPrinter.c @@ -43,7 +43,7 @@ USB_ClassInfo_PRNT_Device_t TextOnly_Printer_Interface = { .Config = { - .InterfaceNumber = 0, + .InterfaceNumber = INTERFACE_ID_Printer, .DataINEndpoint = { .Address = PRINTER_IN_EPADDR, diff --git a/Bootloaders/Printer/Descriptors.c b/Bootloaders/Printer/Descriptors.c index 0fbb3ae7e..5329afc86 100644 --- a/Bootloaders/Printer/Descriptors.c +++ b/Bootloaders/Printer/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_Printer, .AlternateSetting = 0, .TotalEndpoints = 2, diff --git a/Bootloaders/Printer/Descriptors.h b/Bootloaders/Printer/Descriptors.h index fba326a93..d5c9b71ee 100644 --- a/Bootloaders/Printer/Descriptors.h +++ b/Bootloaders/Printer/Descriptors.h @@ -66,15 +66,24 @@ USB_Descriptor_Endpoint_t Printer_DataOutEndpoint; } USB_Descriptor_Configuration_t; + /** Enum for the device interface 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 + * interface from other descriptors. + */ + enum InterfaceDescriptors_t + { + INTERFACE_ID_Printer = 0, /**< Printer 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: */ |