diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-07-30 03:52:11 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-07-30 03:52:11 +0000 |
| commit | 24e621a8d8424721ed21ce329d2a28dbf8c35343 (patch) | |
| tree | a014f41c82dfbb50706e1a911a5da2414b9766fd /Demos | |
| parent | 7c8d16fd7adae430f94004048a7702b7338f5eb1 (diff) | |
| download | lufa-24e621a8d8424721ed21ce329d2a28dbf8c35343.tar.gz lufa-24e621a8d8424721ed21ce329d2a28dbf8c35343.tar.bz2 lufa-24e621a8d8424721ed21ce329d2a28dbf8c35343.zip | |
Altered the CDC Deivice and Host Class drivers' receive byte routines, so that no data is indicated by a negative return value.
Added auto flushing of OUT data to the CDC Host Class driver's USBTask function to automatically flush the send pipe buffer.
Diffstat (limited to 'Demos')
4 files changed, 9 insertions, 12 deletions
diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.c b/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.c index cc8f92ccd..53d7ce9fc 100644 --- a/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.c +++ b/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.c @@ -101,12 +101,12 @@ int main(void) CheckJoystickMovement(); /* Discard all received data on the first CDC interface */ - while (CDC_Device_BytesReceived(&VirtualSerial1_CDC_Interface)) - CDC_Device_ReceiveByte(&VirtualSerial1_CDC_Interface); + CDC_Device_ReceiveByte(&VirtualSerial1_CDC_Interface); /* Echo all received data on the second CDC interface */ - while (CDC_Device_BytesReceived(&VirtualSerial2_CDC_Interface)) - CDC_Device_SendByte(&VirtualSerial2_CDC_Interface, CDC_Device_ReceiveByte(&VirtualSerial2_CDC_Interface)); + int16_t ReceivedByte; = CDC_Device_ReceiveByte(&VirtualSerial2_CDC_Interface); + if (!(ReceivedByte < 0)) + CDC_Device_SendByte(&VirtualSerial2_CDC_Interface, (uint8_t)ReceivedByte); CDC_Device_USBTask(&VirtualSerial1_CDC_Interface); CDC_Device_USBTask(&VirtualSerial2_CDC_Interface); diff --git a/Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.c b/Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.c index d76f8cf95..c87b33ca7 100644 --- a/Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.c +++ b/Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.c @@ -83,8 +83,7 @@ int main(void) CheckJoystickMovement(); /* Must throw away unused bytes from the host, or it will lock up while waiting for the device */ - while (CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface)) - CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface); + CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface); CDC_Device_USBTask(&VirtualSerial_CDC_Interface); USB_USBTask(); diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.c b/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.c index 8db86b84a..6dfdafba7 100644 --- a/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.c +++ b/Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.c @@ -97,8 +97,7 @@ int main(void) CheckJoystickMovement(); /* Must throw away unused bytes from the host, or it will lock up while waiting for the device */ - while (CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface)) - CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface); + CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface); CDC_Device_USBTask(&VirtualSerial_CDC_Interface); HID_Device_USBTask(&Mouse_HID_Interface); diff --git a/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.c b/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.c index 543e09825..c48694274 100644 --- a/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.c +++ b/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.c @@ -111,10 +111,9 @@ int main(void) if (CDC_Host_BytesReceived(&VirtualSerial_CDC_Interface)) { /* Echo received bytes from the attached device through the USART */ - while (CDC_Host_BytesReceived(&VirtualSerial_CDC_Interface)) - putchar(CDC_Host_ReceiveByte(&VirtualSerial_CDC_Interface)); - - CDC_Host_Flush(&VirtualSerial_CDC_Interface); + int16_t ReceivedByte = CDC_Host_ReceiveByte(&VirtualSerial_CDC_Interface); + if (!(ReceivedByte < 0)) + putchar(ReceivedByte); } break; |