From 24e621a8d8424721ed21ce329d2a28dbf8c35343 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Fri, 30 Jul 2010 03:52:11 +0000 Subject: 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. --- Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.c | 8 ++++---- Demos/Device/ClassDriver/VirtualSerial/VirtualSerial.c | 3 +-- Demos/Device/ClassDriver/VirtualSerialMouse/VirtualSerialMouse.c | 3 +-- 3 files changed, 6 insertions(+), 8 deletions(-) (limited to 'Demos/Device') 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); -- cgit v1.2.3