diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-01-16 23:13:54 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-01-16 23:13:54 +0000 |
| commit | 47fec03694c933a388eadf3242a6e40177b57d74 (patch) | |
| tree | 1fdcdf76ca126dc3b5a016696dbbd527f5130aad | |
| parent | 787869c2fd722c4212bc778f43ba1e82fc843449 (diff) | |
| download | lufa-47fec03694c933a388eadf3242a6e40177b57d74.tar.gz lufa-47fec03694c933a388eadf3242a6e40177b57d74.tar.bz2 lufa-47fec03694c933a388eadf3242a6e40177b57d74.zip | |
Fixed several functions in the Host mode Still Image Class driver returning an error code from the incorrect error code enum (thanks to Daniel Seibert).
| -rw-r--r-- | LUFA/Drivers/USB/Class/Host/StillImage.c | 8 | ||||
| -rw-r--r-- | LUFA/ManPages/ChangeLog.txt | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/LUFA/Drivers/USB/Class/Host/StillImage.c b/LUFA/Drivers/USB/Class/Host/StillImage.c index 7556c3648..3bfd36ca7 100644 --- a/LUFA/Drivers/USB/Class/Host/StillImage.c +++ b/LUFA/Drivers/USB/Class/Host/StillImage.c @@ -367,7 +367,7 @@ uint8_t SI_Host_ReceiveEventHeader(USB_ClassInfo_SI_Host_t* const SIInterfaceInf uint8_t SI_Host_OpenSession(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo) { if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive)) - return HOST_SENDCONTROL_DeviceDisconnected; + return PIPE_RWSTREAM_DeviceDisconnected; uint8_t ErrorCode; @@ -399,7 +399,7 @@ uint8_t SI_Host_OpenSession(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo) uint8_t SI_Host_CloseSession(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo) { if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive)) - return HOST_SENDCONTROL_DeviceDisconnected; + return PIPE_RWSTREAM_DeviceDisconnected; uint8_t ErrorCode; @@ -431,7 +431,7 @@ uint8_t SI_Host_SendCommand(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo, uint32_t* const Params) { if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive)) - return HOST_SENDCONTROL_DeviceDisconnected; + return PIPE_RWSTREAM_DeviceDisconnected; uint8_t ErrorCode; @@ -456,7 +456,7 @@ uint8_t SI_Host_ReceiveResponse(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo) PIMA_Container_t PIMABlock; if ((USB_HostState != HOST_STATE_Configured) || !(SIInterfaceInfo->State.IsActive)) - return HOST_SENDCONTROL_DeviceDisconnected; + return PIPE_RWSTREAM_DeviceDisconnected; if ((ErrorCode = SI_Host_ReceiveBlockHeader(SIInterfaceInfo, &PIMABlock)) != PIPE_RWSTREAM_NoError) return ErrorCode; diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt index 9ae408416..8116a5959 100644 --- a/LUFA/ManPages/ChangeLog.txt +++ b/LUFA/ManPages/ChangeLog.txt @@ -52,6 +52,8 @@ * - Fixed incorrect endpoint initialisation order in the several device demos (thanks to Rick Drolet) * - Fixed inverted Minimum board LEDs * - Fixed incorrect byte ordering in the Audio_Device_WriteSample24 function (thanks to WZab) + * - Fixed several functions in the Host mode Still Image Class driver returning an error code from the incorrect + * error code enum (thanks to Daniel Seibert) * - Library Applications: * - Fixed Benito project discarding incoming data from the USB virtual serial port when the USART is busy * - Fixed broken DFU bootloader, added XPLAIN support for bootloader start when XCK jumpered to ground |