eqmk
/
qmk_firmware
forked from mfulz_github/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Be doubly-certain that the incomming CDC class driver's endpoint/pipe is flushed only once when the bank is empty.

This commit is contained in:
Dean Camera 2010-01-28 06:37:26 +00:00
parent cec699ac59
commit d26a9ed5fd
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
LUFA/Drivers/USB/Class/Device/CDC.c
View File

@ -190,10 +190,17 @@ uint16_t CDC_Device_BytesReceived(USB_ClassInfo_CDC_Device_t* const CDCInterface
Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataOUTEndpointNumber); Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataOUTEndpointNumber);
if (Endpoint_IsOUTReceived() && !(Endpoint_BytesInEndpoint())) if (Endpoint_IsOUTReceived())
Endpoint_ClearOUT(); {
if (!(Endpoint_BytesInEndpoint()))
Endpoint_ClearOUT();
return Endpoint_BytesInEndpoint(); return Endpoint_BytesInEndpoint();
}
else
{
return 0;
}
} }
uint8_t CDC_Device_ReceiveByte(USB_ClassInfo_CDC_Device_t* CDCInterfaceInfo) uint8_t CDC_Device_ReceiveByte(USB_ClassInfo_CDC_Device_t* CDCInterfaceInfo)

23
LUFA/Drivers/USB/Class/Host/CDC.c
View File

@ -309,13 +309,22 @@ uint16_t CDC_Host_BytesReceived(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo
Pipe_SetPipeToken(PIPE_TOKEN_IN); Pipe_SetPipeToken(PIPE_TOKEN_IN);
Pipe_Unfreeze(); Pipe_Unfreeze();
if (Pipe_IsINReceived() && !(Pipe_BytesInPipe())) if (Pipe_IsINReceived())
Pipe_ClearIN(); {
if (!(Pipe_BytesInPipe()))
BytesInPipe = Pipe_BytesInPipe(); Pipe_ClearIN();
Pipe_Freeze();
BytesInPipe = Pipe_BytesInPipe();
return BytesInPipe; Pipe_Freeze();
return BytesInPipe;
}
else
{
Pipe_Freeze();
return 0;
}
} }
uint8_t CDC_Host_ReceiveByte(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo) uint8_t CDC_Host_ReceiveByte(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)