diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-06-23 08:03:09 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-06-23 08:03:09 +0000 |
| commit | a3a04aa6719a891a1350179d5ac451c3e18c3bf2 (patch) | |
| tree | d3d73e56fe2f3aef176106780e875940c0c8b35d /LUFA/Drivers/USB/LowLevel | |
| parent | 7f81803aaa312d589f79a77d1426150dcceb29f7 (diff) | |
| download | lufa-a3a04aa6719a891a1350179d5ac451c3e18c3bf2.tar.gz lufa-a3a04aa6719a891a1350179d5ac451c3e18c3bf2.tar.bz2 lufa-a3a04aa6719a891a1350179d5ac451c3e18c3bf2.zip | |
Pipe_ConfigurePipe() now automatically defaults IN pipes to accepting infinite IN requests, this can still be changed by calling the existing \ref Pipe_SetFiniteINRequests() function.
Diffstat (limited to 'LUFA/Drivers/USB/LowLevel')
| -rw-r--r-- | LUFA/Drivers/USB/LowLevel/Host.c | 2 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/LowLevel/Pipe.c | 3 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/LowLevel/Pipe.h | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/LUFA/Drivers/USB/LowLevel/Host.c b/LUFA/Drivers/USB/LowLevel/Host.c index 1932b645c..037e6d80a 100644 --- a/LUFA/Drivers/USB/LowLevel/Host.c +++ b/LUFA/Drivers/USB/LowLevel/Host.c @@ -162,8 +162,6 @@ void USB_Host_ProcessNextHostState(void) break;
}
- Pipe_SetInfiniteINRequests();
-
USB_ControlRequest = (USB_Request_Header_t)
{
.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),
diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.c b/LUFA/Drivers/USB/LowLevel/Pipe.c index 35ba480cd..aead39dc5 100644 --- a/LUFA/Drivers/USB/LowLevel/Pipe.c +++ b/LUFA/Drivers/USB/LowLevel/Pipe.c @@ -48,6 +48,9 @@ bool Pipe_ConfigurePipe(const uint8_t Number, const uint8_t Type, const uint8_t UPCFG0X = ((Type << EPTYPE0) | Token | ((EndpointNumber & PIPE_EPNUM_MASK) << PEPNUM0));
UPCFG1X = ((1 << ALLOC) | Banks | Pipe_BytesToEPSizeMask(Size));
+ if (Token == PIPE_TOKEN_IN)
+ Pipe_SetInfiniteINRequests();
+
return Pipe_IsConfigured();
}
diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.h b/LUFA/Drivers/USB/LowLevel/Pipe.h index 30f2d387c..30e0fde90 100644 --- a/LUFA/Drivers/USB/LowLevel/Pipe.h +++ b/LUFA/Drivers/USB/LowLevel/Pipe.h @@ -732,7 +732,9 @@ *
* A newly configured pipe is frozen by default, and must be unfrozen before use via the \ref Pipe_Unfreeze()
* before being used. Pipes should be kept frozen unless waiting for data from a device while in IN mode, or
- * sending data to the device in OUT mode.
+ * sending data to the device in OUT mode. IN type pipes are also automatically configured to accept infinite
+ * numbers of IN requests without automatic freezing - this can be overridden by a call to
+ * \ref Pipe_SetFiniteINRequests().
*
* \note The default control pipe does not have to be manually configured, as it is automatically
* configured by the library internally.
|