From 4f5d8140e65f0c747ef88cc770a4f450c0812e54 Mon Sep 17 00:00:00 2001 From: Dean Date: Thu, 30 Sep 2010 08:07:29 +0000 Subject: [PATCH] Fix incorrectly named configuration descriptor callback routines in the host mode class drivers. Fix typo in MIDI low level device demo. git-svn-id: http://lufa-lib.googlecode.com/svn@1504 d5102386-fcda-11dd-9fdb-3debd5008f28 --- trunk/Demos/Device/LowLevel/MIDI/Descriptors.c | 2 +- trunk/LUFA/Drivers/USB/Class/Host/HID.c | 18 ++++++++++++------ trunk/LUFA/Drivers/USB/Class/Host/HID.h | 2 +- trunk/LUFA/Drivers/USB/Class/Host/Printer.c | 10 +++++----- trunk/LUFA/Drivers/USB/Class/Host/Printer.h | 4 ++-- trunk/LUFA/ManPages/FutureChanges.txt | 1 - 6 files changed, 21 insertions(+), 16 deletions(-) diff --git a/trunk/Demos/Device/LowLevel/MIDI/Descriptors.c b/trunk/Demos/Device/LowLevel/MIDI/Descriptors.c index 8e8746aa2..3c2efdbd9 100644 --- a/trunk/Demos/Device/LowLevel/MIDI/Descriptors.c +++ b/trunk/Demos/Device/LowLevel/MIDI/Descriptors.c @@ -55,7 +55,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor = .VendorID = 0x03EB, .ProductID = 0x2048, - .ReleaseNumber = VERSION_BCD(00.01),, + .ReleaseNumber = VERSION_BCD(00.01), .ManufacturerStrIndex = 0x01, .ProductStrIndex = 0x02, diff --git a/trunk/LUFA/Drivers/USB/Class/Host/HID.c b/trunk/LUFA/Drivers/USB/Class/Host/HID.c index cd22e65fc..b0593f0f4 100644 --- a/trunk/LUFA/Drivers/USB/Class/Host/HID.c +++ b/trunk/LUFA/Drivers/USB/Class/Host/HID.c @@ -65,9 +65,12 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo HIDInterfaceInfo->State.InterfaceNumber = CurrentHIDInterface->InterfaceNumber; HIDInterfaceInfo->State.SupportsBootProtocol = (CurrentHIDInterface->SubClass != HID_BOOTP_NonBootProtocol); - if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, DCOMP_HID_NextHID) != DESCRIPTOR_SEARCH_COMP_Found) - return HID_ENUMERROR_NoCompatibleInterfaceFound; - + if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, + DCOMP_HID_Host_NextHID) != DESCRIPTOR_SEARCH_COMP_Found) + { + return HID_ENUMERROR_NoCompatibleInterfaceFound; + } + HIDInterfaceInfo->State.HIDReportSize = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_HID_Descriptor_HID_t)->HIDReportLength; @@ -94,8 +97,11 @@ uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo HIDInterfaceInfo->State.InterfaceNumber = CurrentHIDInterface->InterfaceNumber; HIDInterfaceInfo->State.SupportsBootProtocol = (CurrentHIDInterface->SubClass != HID_BOOTP_NonBootProtocol); - if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, DCOMP_HID_NextHID) != DESCRIPTOR_SEARCH_COMP_Found) - return HID_ENUMERROR_NoCompatibleInterfaceFound; + if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, + DCOMP_HID_Host_NextHID) != DESCRIPTOR_SEARCH_COMP_Found) + { + return HID_ENUMERROR_NoCompatibleInterfaceFound; + } HIDInterfaceInfo->State.HIDReportSize = DESCRIPTOR_PCAST(ConfigDescriptorData, USB_HID_Descriptor_HID_t)->HIDReportLength; @@ -157,7 +163,7 @@ static uint8_t DCOMP_HID_Host_NextHIDInterface(void* const CurrentDescriptor) return DESCRIPTOR_SEARCH_NotFound; } -static uint8_t DCOMP_HID_NextHID(void* const CurrentDescriptor) +static uint8_t DCOMP_HID_Host_NextHID(void* const CurrentDescriptor) { if (DESCRIPTOR_TYPE(CurrentDescriptor) == HID_DTYPE_HID) return DESCRIPTOR_SEARCH_Found; diff --git a/trunk/LUFA/Drivers/USB/Class/Host/HID.h b/trunk/LUFA/Drivers/USB/Class/Host/HID.h index fc9249c21..8a16a4f6b 100644 --- a/trunk/LUFA/Drivers/USB/Class/Host/HID.h +++ b/trunk/LUFA/Drivers/USB/Class/Host/HID.h @@ -298,7 +298,7 @@ /* Function Prototypes: */ #if defined(__INCLUDE_FROM_HID_CLASS_HOST_C) static uint8_t DCOMP_HID_Host_NextHIDInterface(void* const CurrentDescriptor) ATTR_NON_NULL_PTR_ARG(1); - static uint8_t DCOMP_HID_NextHID(void* const CurrentDescriptor) ATTR_NON_NULL_PTR_ARG(1); + static uint8_t DCOMP_HID_Host_NextHID(void* const CurrentDescriptor) ATTR_NON_NULL_PTR_ARG(1); static uint8_t DCOMP_HID_Host_NextHIDInterfaceEndpoint(void* const CurrentDescriptor) ATTR_NON_NULL_PTR_ARG(1); #endif #endif diff --git a/trunk/LUFA/Drivers/USB/Class/Host/Printer.c b/trunk/LUFA/Drivers/USB/Class/Host/Printer.c index e1c3e1550..6b16228d5 100644 --- a/trunk/LUFA/Drivers/USB/Class/Host/Printer.c +++ b/trunk/LUFA/Drivers/USB/Class/Host/Printer.c @@ -49,7 +49,7 @@ uint8_t PRNT_Host_ConfigurePipes(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceI return PRNT_ENUMERROR_InvalidConfigDescriptor; if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &DeviceConfigDescriptor, - DCOMP_PRNT_NextPRNTInterface) != DESCRIPTOR_SEARCH_COMP_Found) + DCOMP_PRNT_Host_NextPRNTInterface) != DESCRIPTOR_SEARCH_COMP_Found) { return PRNT_ENUMERROR_NoCompatibleInterfaceFound; } @@ -62,13 +62,13 @@ uint8_t PRNT_Host_ConfigurePipes(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceI while (!(DataINEndpoint) || !(DataOUTEndpoint)) { if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &DeviceConfigDescriptor, - DCOMP_PRNT_NextPRNTInterfaceEndpoint) != DESCRIPTOR_SEARCH_COMP_Found) + DCOMP_PRNT_Host_NextPRNTInterfaceEndpoint) != DESCRIPTOR_SEARCH_COMP_Found) { DataINEndpoint = NULL; DataOUTEndpoint = NULL; if (USB_GetNextDescriptorComp(&ConfigDescriptorSize, &DeviceConfigDescriptor, - DCOMP_PRNT_NextPRNTInterface) != DESCRIPTOR_SEARCH_COMP_Found) + DCOMP_PRNT_Host_NextPRNTInterface) != DESCRIPTOR_SEARCH_COMP_Found) { return PRNT_ENUMERROR_NoCompatibleInterfaceFound; } @@ -114,7 +114,7 @@ uint8_t PRNT_Host_ConfigurePipes(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceI return PRNT_ENUMERROR_NoError; } -static uint8_t DCOMP_PRNT_NextPRNTInterface(void* CurrentDescriptor) +static uint8_t DCOMP_PRNT_Host_NextPRNTInterface(void* CurrentDescriptor) { if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Interface) { @@ -129,7 +129,7 @@ static uint8_t DCOMP_PRNT_NextPRNTInterface(void* CurrentDescriptor) return DESCRIPTOR_SEARCH_NotFound; } -static uint8_t DCOMP_PRNT_NextPRNTInterfaceEndpoint(void* CurrentDescriptor) +static uint8_t DCOMP_PRNT_Host_NextPRNTInterfaceEndpoint(void* CurrentDescriptor) { if (DESCRIPTOR_TYPE(CurrentDescriptor) == DTYPE_Endpoint) { diff --git a/trunk/LUFA/Drivers/USB/Class/Host/Printer.h b/trunk/LUFA/Drivers/USB/Class/Host/Printer.h index 9848287f4..4cbcbff4d 100644 --- a/trunk/LUFA/Drivers/USB/Class/Host/Printer.h +++ b/trunk/LUFA/Drivers/USB/Class/Host/Printer.h @@ -271,8 +271,8 @@ /* Function Prototypes: */ #if defined(__INCLUDE_FROM_PRINTER_CLASS_HOST_C) - static uint8_t DCOMP_PRNT_NextPRNTInterface(void* const CurrentDescriptor) ATTR_NON_NULL_PTR_ARG(1); - static uint8_t DCOMP_PRNT_NextPRNTInterfaceEndpoint(void* const CurrentDescriptor) ATTR_NON_NULL_PTR_ARG(1); + static uint8_t DCOMP_PRNT_Host_NextPRNTInterface(void* const CurrentDescriptor) ATTR_NON_NULL_PTR_ARG(1); + static uint8_t DCOMP_PRNT_Host_NextPRNTInterfaceEndpoint(void* const CurrentDescriptor) ATTR_NON_NULL_PTR_ARG(1); #endif #endif diff --git a/trunk/LUFA/ManPages/FutureChanges.txt b/trunk/LUFA/ManPages/FutureChanges.txt index 5568a978e..b1196d70d 100644 --- a/trunk/LUFA/ManPages/FutureChanges.txt +++ b/trunk/LUFA/ManPages/FutureChanges.txt @@ -19,7 +19,6 @@ * -# Change makefiles to allow for absolute LUFA location to be used * -# Re-add interrupt Pipe/Endpoint support * -# Fix intermittent device mode enumeration errors - * -# Shrink binary size for 8U2 parts * - Documentation/Support * -# Add detailed overviews of how each demo works * -# Add board overviews