From c1c94fe5a0e0bcfb5ec37ed987b45954afe768cd Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Thu, 3 Mar 2011 19:32:27 +0000 Subject: Fixed Still Image Host class driver exiting the descriptor search routine prematurely if the data pipes (but not event pipe) is found. Fixed missing call to Pipe_SetInfiniteINRequests() in the Pipe_ConfigurePipe() routine. --- LUFA/Drivers/USB/Class/Host/StillImage.c | 2 +- LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/LUFA/Drivers/USB/Class/Host/StillImage.c b/LUFA/Drivers/USB/Class/Host/StillImage.c index 1fbe000ba..c1a6cacbd 100644 --- a/LUFA/Drivers/USB/Class/Host/StillImage.c +++ b/LUFA/Drivers/USB/Class/Host/StillImage.c @@ -51,7 +51,7 @@ uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, if (DESCRIPTOR_TYPE(ConfigDescriptorData) != DTYPE_Configuration) return SI_ENUMERROR_InvalidConfigDescriptor; - while (!(DataINEndpoint) || !(DataOUTEndpoint)) + while (!(DataINEndpoint) || !(DataOUTEndpoint) || !(EventsEndpoint)) { if (!(StillImageInterface) || USB_GetNextDescriptorComp(&ConfigDescriptorSize, &ConfigDescriptorData, diff --git a/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c index 2073c8ef2..48445293e 100644 --- a/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c +++ b/LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c @@ -87,6 +87,8 @@ bool Pipe_ConfigurePipe(const uint8_t Number, UPIENXTemp = UPIENX; } + Pipe_SetInfiniteINRequests(); + if (!(UPCFG1XTemp & (1 << ALLOC))) continue; -- cgit v1.2.3