diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2011-07-11 05:51:04 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2011-07-11 05:51:04 +0000 |
| commit | 79e05ef893d718e84dcdde805aa9bca2ca4fd019 (patch) | |
| tree | eb07c90e4c43802998019427a419be800d99d7c1 /LUFA/Drivers | |
| parent | 7106f5e2c0e2a53ff3bda55ce3df1ac6f8b57485 (diff) | |
Minor documentation and style fixes.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1854 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'LUFA/Drivers')
| -rw-r--r-- | LUFA/Drivers/USB/Class/Host/MassStorage.c | 8 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Core/HostStandardReq.c | 4 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Core/HostStandardReq.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/LUFA/Drivers/USB/Class/Host/MassStorage.c b/LUFA/Drivers/USB/Class/Host/MassStorage.c index 17f3ba70..2b7d88ec 100644 --- a/LUFA/Drivers/USB/Class/Host/MassStorage.c +++ b/LUFA/Drivers/USB/Class/Host/MassStorage.c @@ -172,12 +172,12 @@ static uint8_t MS_Host_SendCommand(USB_ClassInfo_MS_Host_t* const MSInterfaceInf { uint8_t ErrorCode = PIPE_RWSTREAM_NoError; - SCSICommandBlock->Signature = MS_CBW_SIGNATURE; - SCSICommandBlock->Tag = ++MSInterfaceInfo->State.TransactionTag; - - if (MSInterfaceInfo->State.TransactionTag == 0xFFFFFFFF) + if (++MSInterfaceInfo->State.TransactionTag == 0xFFFFFFFF) MSInterfaceInfo->State.TransactionTag = 1; + SCSICommandBlock->Signature = MS_CBW_SIGNATURE; + SCSICommandBlock->Tag = MSInterfaceInfo->State.TransactionTag; + Pipe_SelectPipe(MSInterfaceInfo->Config.DataOUTPipeNumber); Pipe_Unfreeze(); diff --git a/LUFA/Drivers/USB/Core/HostStandardReq.c b/LUFA/Drivers/USB/Core/HostStandardReq.c index a9451ff1..8304c2c2 100644 --- a/LUFA/Drivers/USB/Core/HostStandardReq.c +++ b/LUFA/Drivers/USB/Core/HostStandardReq.c @@ -238,14 +238,14 @@ uint8_t USB_Host_GetDeviceStringDescriptor(const uint8_t Index, return USB_Host_SendControlRequest(Buffer); } -uint8_t USB_Host_ClearPipeStall(const uint8_t EndpointNum) +uint8_t USB_Host_ClearPipeStall(const uint8_t EndpointAddress) { USB_ControlRequest = (USB_Request_Header_t) { .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_ENDPOINT), .bRequest = REQ_ClearFeature, .wValue = FEATURE_SEL_EndpointHalt, - .wIndex = EndpointNum, + .wIndex = EndpointAddress, .wLength = 0, }; diff --git a/LUFA/Drivers/USB/Core/HostStandardReq.h b/LUFA/Drivers/USB/Core/HostStandardReq.h index b74aa3a3..3358d277 100644 --- a/LUFA/Drivers/USB/Core/HostStandardReq.h +++ b/LUFA/Drivers/USB/Core/HostStandardReq.h @@ -162,11 +162,11 @@ * * \ingroup Group_PipeControlReq * - * \param[in] EndpointIndex Index of the endpoint to clear, including the endpoint's direction. + * \param[in] EndpointAddress Address of the endpoint to clear, including the endpoint's direction. * * \return A value from the \ref USB_Host_SendControlErrorCodes_t enum to indicate the result. */ - uint8_t USB_Host_ClearPipeStall(const uint8_t EndpointIndex); + uint8_t USB_Host_ClearPipeStall(const uint8_t EndpointAddress); /** Selects a given alternative setting for the specified interface, via a SET INTERFACE standard request to * the attached device. |