diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2013-08-23 22:59:58 +0200 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2013-08-23 22:59:58 +0200 |
| commit | aded8373cc07cc749b6ca0f862ba119828f26601 (patch) | |
| tree | 6fcfe16ca39d7757d6b3141266f4b5cd67cc5d8e | |
| parent | 44bc433fb0694ecea05bf35d001f3e5d846b7ec4 (diff) | |
| download | lufa-aded8373cc07cc749b6ca0f862ba119828f26601.tar.gz lufa-aded8373cc07cc749b6ca0f862ba119828f26601.tar.bz2 lufa-aded8373cc07cc749b6ca0f862ba119828f26601.zip | |
Fixed error receiving PIMA events via the Still Image Host class driver.
| -rw-r--r-- | LUFA/DoxygenPages/ChangeLog.txt | 1 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Class/Common/StillImageClassCommon.h | 16 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Class/Host/StillImageClassHost.c | 2 |
3 files changed, 10 insertions, 9 deletions
diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt index 5cd6074f4..26eff54af 100644 --- a/LUFA/DoxygenPages/ChangeLog.txt +++ b/LUFA/DoxygenPages/ChangeLog.txt @@ -43,6 +43,7 @@ * - Fixed incorrect USB device state set when a suspended LUFA device is woken while addressed but not configured (thanks to Balaji Krishnan) * - Fixed broken USART SPI driver for the AVR8 architecture due to incorrect initialization * - Fixed re-enumeration issue of XMEGA architecture targets (thanks to Jaroslav Jedlinsky) + * - Fixed error receiving PIMA events via the Still Image Host class driver * - Library Applications: * - Added handler for SCSI_CMD_START_STOP_UNIT in demos using the Mass Storage class, to prevent ejection errors on *nix systems due to an * unknown SCSI command diff --git a/LUFA/Drivers/USB/Class/Common/StillImageClassCommon.h b/LUFA/Drivers/USB/Class/Common/StillImageClassCommon.h index 0c7db4667..fd7b035c9 100644 --- a/LUFA/Drivers/USB/Class/Common/StillImageClassCommon.h +++ b/LUFA/Drivers/USB/Class/Common/StillImageClassCommon.h @@ -119,18 +119,18 @@ { PIMA_RESPONSE_OK = 1, /**< Response code indicating no error in the issued command. */ PIMA_RESPONSE_GeneralError = 2, /**< Response code indicating a general error while processing the - * issued command. - */ + * issued command. + */ PIMA_RESPONSE_SessionNotOpen = 3, /**< Response code indicating that the sent command requires an open - * session before being issued. - */ + * session before being issued. + */ PIMA_RESPONSE_InvalidTransaction = 4, /**< Response code indicating an invalid transaction occurred. */ PIMA_RESPONSE_OperationNotSupported = 5, /**< Response code indicating that the issued command is not supported - * by the attached device. - */ + * by the attached device. + */ PIMA_RESPONSE_ParameterNotSupported = 6, /**< Response code indicating that one or more of the issued command's - * parameters are not supported by the device. - */ + * parameters are not supported by the device. + */ }; /* Type Defines: */ diff --git a/LUFA/Drivers/USB/Class/Host/StillImageClassHost.c b/LUFA/Drivers/USB/Class/Host/StillImageClassHost.c index bcdd1d613..5b317f9fb 100644 --- a/LUFA/Drivers/USB/Class/Host/StillImageClassHost.c +++ b/LUFA/Drivers/USB/Class/Host/StillImageClassHost.c @@ -302,7 +302,7 @@ bool SI_Host_IsEventReceived(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo) Pipe_SelectPipe(SIInterfaceInfo->Config.EventsPipe.Address); Pipe_Unfreeze(); - if (Pipe_BytesInPipe()) + if (Pipe_IsINReceived()) IsEventReceived = true; Pipe_Freeze(); |