From 619b05469be722065b93ba53d4effe8acd164a96 Mon Sep 17 00:00:00 2001 From: Dean Date: Tue, 28 Sep 2010 12:14:06 +0000 Subject: Move out many of the common class driver constants into grouped enums, to make them more managable. Add new CDC descriptor structs to the CDC class driver, so that the CDC demos can use human readable field names. Rename prefix for Still Image Host class driver functions from "SImage_" to "SI_" to remain consistent with the rest of the driver. git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1497 d5102386-fcda-11dd-9fdb-3debd5008f28 --- Projects/TempDataLogger/Descriptors.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Projects/TempDataLogger/Descriptors.c') diff --git a/Projects/TempDataLogger/Descriptors.c b/Projects/TempDataLogger/Descriptors.c index 1b8a4a2f..deb88ab1 100644 --- a/Projects/TempDataLogger/Descriptors.c +++ b/Projects/TempDataLogger/Descriptors.c @@ -171,19 +171,19 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .Class = 0x03, .SubClass = 0x00, - .Protocol = HID_NON_BOOT_PROTOCOL, + .Protocol = HID_BOOTP_NonBootProtocol, .InterfaceStrIndex = NO_DESCRIPTOR }, .HID_GenericHID = { - .Header = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = DTYPE_HID}, + .Header = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID}, .HIDSpec = VERSION_BCD(01.11), .CountryCode = 0x00, .TotalReportDescriptors = 1, - .HIDReportType = DTYPE_Report, + .HIDReportType = HID_DTYPE_Report, .HIDReportLength = sizeof(GenericReport) }, @@ -275,11 +275,11 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, } break; - case DTYPE_HID: + case HID_DTYPE_HID: Address = &ConfigurationDescriptor.HID_GenericHID; Size = sizeof(USB_HID_Descriptor_HID_t); break; - case DTYPE_Report: + case HID_DTYPE_Report: Address = &GenericReport; Size = sizeof(GenericReport); break; -- cgit v1.2.3