diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-11-25 03:26:57 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-11-25 03:26:57 +0000 |
| commit | 8c6c27d88bb40ecf55f369fc4499ec990d2d93d2 (patch) | |
| tree | 21783dc9715b4cd11b1f8ba0a19f28e562cd1805 /LUFA/Drivers/USB/LowLevel | |
| parent | c05c7c7df46a0377db8a72cb32f06aa40153d3e1 (diff) | |
| download | lufa-8c6c27d88bb40ecf55f369fc4499ec990d2d93d2.tar.gz lufa-8c6c27d88bb40ecf55f369fc4499ec990d2d93d2.tar.bz2 lufa-8c6c27d88bb40ecf55f369fc4499ec990d2d93d2.zip | |
Added new RNDISHost Host LowLevel demo. Fixed misnamed Pipe_SetPipeToken() macro for setting a pipe's direction. Fixed CDCHost failing on devices with bidirectional endpoints.
Diffstat (limited to 'LUFA/Drivers/USB/LowLevel')
| -rw-r--r-- | LUFA/Drivers/USB/LowLevel/HostChapter9.c | 10 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/LowLevel/Pipe.c | 2 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/LowLevel/Pipe.h | 2 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/LowLevel/Template/Template_Pipe_RW.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/LUFA/Drivers/USB/LowLevel/HostChapter9.c b/LUFA/Drivers/USB/LowLevel/HostChapter9.c index 42e3262ff..8b104ef7a 100644 --- a/LUFA/Drivers/USB/LowLevel/HostChapter9.c +++ b/LUFA/Drivers/USB/LowLevel/HostChapter9.c @@ -48,7 +48,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr) if ((ReturnStatus = USB_Host_WaitMS(1)) != HOST_WAITERROR_Successful)
goto End_Of_Control_Send;
- Pipe_SetToken(PIPE_TOKEN_SETUP);
+ Pipe_SetPipeToken(PIPE_TOKEN_SETUP);
Pipe_ClearErrorFlags();
Pipe_Unfreeze();
@@ -68,7 +68,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr) if ((USB_ControlRequest.bmRequestType & CONTROL_REQTYPE_DIRECTION) == REQDIR_DEVICETOHOST)
{
- Pipe_SetToken(PIPE_TOKEN_IN);
+ Pipe_SetPipeToken(PIPE_TOKEN_IN);
if (DataStream != NULL)
{
@@ -93,7 +93,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr) }
}
- Pipe_SetToken(PIPE_TOKEN_OUT);
+ Pipe_SetPipeToken(PIPE_TOKEN_OUT);
Pipe_Unfreeze();
if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_OutReady)) != HOST_SENDCONTROL_Successful)
@@ -108,7 +108,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr) {
if (DataStream != NULL)
{
- Pipe_SetToken(PIPE_TOKEN_OUT);
+ Pipe_SetPipeToken(PIPE_TOKEN_OUT);
Pipe_Unfreeze();
while (DataLen)
@@ -131,7 +131,7 @@ uint8_t USB_Host_SendControlRequest(void* BufferPtr) Pipe_Freeze();
}
- Pipe_SetToken(PIPE_TOKEN_IN);
+ Pipe_SetPipeToken(PIPE_TOKEN_IN);
Pipe_Unfreeze();
if ((ReturnStatus = USB_Host_WaitForIOS(USB_HOST_WAITFOR_InReceived)) != HOST_SENDCONTROL_Successful)
diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.c b/LUFA/Drivers/USB/LowLevel/Pipe.c index ccab07413..fd8f81bc6 100644 --- a/LUFA/Drivers/USB/LowLevel/Pipe.c +++ b/LUFA/Drivers/USB/LowLevel/Pipe.c @@ -130,7 +130,7 @@ uint8_t Pipe_Discard_Stream(uint16_t Length {
uint8_t ErrorCode;
- Pipe_SetToken(PIPE_TOKEN_IN);
+ Pipe_SetPipeToken(PIPE_TOKEN_IN);
if ((ErrorCode = Pipe_WaitUntilReady()))
return ErrorCode;
diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.h b/LUFA/Drivers/USB/LowLevel/Pipe.h index c04849167..97257d706 100644 --- a/LUFA/Drivers/USB/LowLevel/Pipe.h +++ b/LUFA/Drivers/USB/LowLevel/Pipe.h @@ -432,7 +432,7 @@ #define Pipe_GetPipeToken() (UPCFG0X & PIPE_TOKEN_MASK)
- #define Pipe_SetToken(token) MACROS{ UPCFG0X = ((UPCFG0X & ~PIPE_TOKEN_MASK) | (token)); }MACROE
+ #define Pipe_SetPipeToken(token) MACROS{ UPCFG0X = ((UPCFG0X & ~PIPE_TOKEN_MASK) | (token)); }MACROE
#define Pipe_SetInfiniteINRequests() MACROS{ UPCONX |= (1 << INMODE); }MACROE
diff --git a/LUFA/Drivers/USB/LowLevel/Template/Template_Pipe_RW.c b/LUFA/Drivers/USB/LowLevel/Template/Template_Pipe_RW.c index d003e4073..ef8035d50 100644 --- a/LUFA/Drivers/USB/LowLevel/Template/Template_Pipe_RW.c +++ b/LUFA/Drivers/USB/LowLevel/Template/Template_Pipe_RW.c @@ -3,7 +3,7 @@ uint8_t TEMPLATE_FUNC_NAME (TEMPLATE_BUFFER_TYPE Buffer, uint16_t Length __CALLB uint8_t* DataStream = ((uint8_t*)Buffer + TEMPLATE_BUFFER_OFFSET(Length));
uint8_t ErrorCode;
- Pipe_SetToken(TEMPLATE_TOKEN);
+ Pipe_SetPipeToken(TEMPLATE_TOKEN);
if ((ErrorCode = Pipe_WaitUntilReady()))
return ErrorCode;
|