From bcb4aef5ee2ef8ac6c28092d55ee9ea72b75b7dc Mon Sep 17 00:00:00 2001 From: Dean Date: Mon, 25 Oct 2010 12:42:55 +0000 Subject: Add descriptor class, subclass and protocol constants to the class drivers, modify all demos to use them where possible. Move out private/internal host class driver constants to the common class driver headers, so that they can be used in the Low Level host mode demos. Ensure all demos, projects and bootloaders use the class driver constants where possible to minimise code repetition. git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1538 d5102386-fcda-11dd-9fdb-3debd5008f28 --- Bootloaders/CDC/Descriptors.c | 18 +++++++++--------- Bootloaders/DFU/Descriptors.c | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'Bootloaders') diff --git a/Bootloaders/CDC/Descriptors.c b/Bootloaders/CDC/Descriptors.c index ae04fbd6..b527454d 100644 --- a/Bootloaders/CDC/Descriptors.c +++ b/Bootloaders/CDC/Descriptors.c @@ -47,9 +47,9 @@ USB_Descriptor_Device_t DeviceDescriptor = .Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device}, .USBSpecification = VERSION_BCD(01.10), - .Class = 0x02, - .SubClass = 0x00, - .Protocol = 0x00, + .Class = CDC_CSCP_CDCClass, + .SubClass = CDC_CSCP_NoSpecificSubclass, + .Protocol = CDC_CSCP_NoSpecificProtocol, .Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE, @@ -95,9 +95,9 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor = .TotalEndpoints = 1, - .Class = 0x02, - .SubClass = 0x02, - .Protocol = 0x01, + .Class = CDC_CSCP_CDCClass, + .SubClass = CDC_CSCP_ACMSubclass, + .Protocol = CDC_CSCP_ATCommandProtocol, .InterfaceStrIndex = NO_DESCRIPTOR }, @@ -146,9 +146,9 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor = .TotalEndpoints = 2, - .Class = 0x0A, - .SubClass = 0x00, - .Protocol = 0x00, + .Class = CDC_CSCP_CDCDataClass, + .SubClass = CDC_CSCP_NoDataSubclass, + .Protocol = CDC_CSCP_NoDataProtocol, .InterfaceStrIndex = NO_DESCRIPTOR }, diff --git a/Bootloaders/DFU/Descriptors.c b/Bootloaders/DFU/Descriptors.c index e7051a75..25df7fc4 100644 --- a/Bootloaders/DFU/Descriptors.c +++ b/Bootloaders/DFU/Descriptors.c @@ -47,9 +47,9 @@ USB_Descriptor_Device_t DeviceDescriptor = .Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device}, .USBSpecification = VERSION_BCD(01.10), - .Class = 0x00, - .SubClass = 0x00, - .Protocol = 0x00, + .Class = USB_CSCP_NoDeviceClass, + .SubClass = USB_CSCP_NoDeviceSubclass, + .Protocol = USB_CSCP_NoDeviceProtocol, .Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE, -- cgit v1.2.3