diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-01-28 06:37:26 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-01-28 06:37:26 +0000 |
| commit | d26a9ed5fd6fc60a0dfa61d04f5ae2bd7163a85d (patch) | |
| tree | d8eca51e0d147fa740b47d6ef1bd9eada3248e85 /LUFA/Drivers | |
| parent | cec699ac591a679010e07431dfb17823a79856df (diff) | |
| download | lufa-d26a9ed5fd6fc60a0dfa61d04f5ae2bd7163a85d.tar.gz lufa-d26a9ed5fd6fc60a0dfa61d04f5ae2bd7163a85d.tar.bz2 lufa-d26a9ed5fd6fc60a0dfa61d04f5ae2bd7163a85d.zip | |
Be doubly-certain that the incomming CDC class driver's endpoint/pipe is flushed only once when the bank is empty.
Diffstat (limited to 'LUFA/Drivers')
| -rw-r--r-- | LUFA/Drivers/USB/Class/Device/CDC.c | 13 | ||||
| -rw-r--r-- | LUFA/Drivers/USB/Class/Host/CDC.c | 23 |
2 files changed, 26 insertions, 10 deletions
diff --git a/LUFA/Drivers/USB/Class/Device/CDC.c b/LUFA/Drivers/USB/Class/Device/CDC.c index 16bc01549..b8a673f03 100644 --- a/LUFA/Drivers/USB/Class/Device/CDC.c +++ b/LUFA/Drivers/USB/Class/Device/CDC.c @@ -190,10 +190,17 @@ uint16_t CDC_Device_BytesReceived(USB_ClassInfo_CDC_Device_t* const CDCInterface Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataOUTEndpointNumber);
- if (Endpoint_IsOUTReceived() && !(Endpoint_BytesInEndpoint()))
- Endpoint_ClearOUT();
+ if (Endpoint_IsOUTReceived())
+ {
+ 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)
diff --git a/LUFA/Drivers/USB/Class/Host/CDC.c b/LUFA/Drivers/USB/Class/Host/CDC.c index 8ad37de73..85864b05c 100644 --- a/LUFA/Drivers/USB/Class/Host/CDC.c +++ b/LUFA/Drivers/USB/Class/Host/CDC.c @@ -309,13 +309,22 @@ uint16_t CDC_Host_BytesReceived(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo Pipe_SetPipeToken(PIPE_TOKEN_IN);
Pipe_Unfreeze();
- if (Pipe_IsINReceived() && !(Pipe_BytesInPipe()))
- Pipe_ClearIN();
-
- BytesInPipe = Pipe_BytesInPipe();
- Pipe_Freeze();
-
- return BytesInPipe;
+ if (Pipe_IsINReceived())
+ {
+ if (!(Pipe_BytesInPipe()))
+ Pipe_ClearIN();
+
+ BytesInPipe = Pipe_BytesInPipe();
+ Pipe_Freeze();
+
+ return BytesInPipe;
+ }
+ else
+ {
+ Pipe_Freeze();
+
+ return 0;
+ }
}
uint8_t CDC_Host_ReceiveByte(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo)
|