diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2011-03-03 19:32:27 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2011-03-03 19:32:27 +0000 |
| commit | ec5da38d0918b50a61dcee0c044ee3c7c6b56e90 (patch) | |
| tree | 088d03b46dcaba731c43271505d291d6b1e6e27c | |
| parent | 54a063c1448d108fcbe60242047e4f818e4ce5e3 (diff) | |
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.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1694 d5102386-fcda-11dd-9fdb-3debd5008f28
| -rw-r--r-- | LUFA/Drivers/USB/Class/Host/StillImage.c | 2 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Core/AVR8/Pipe_AVR8.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/LUFA/Drivers/USB/Class/Host/StillImage.c b/LUFA/Drivers/USB/Class/Host/StillImage.c index 1fbe000b..c1a6cacb 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 2073c8ef..48445293 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; |