aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2018-01-22 15:57:24 +1100
committerDean Camera <dean@fourwalledcubicle.com>2018-01-22 15:58:05 +1100
commit8802907ce274489690f8edf169454f750c8efe57 (patch)
tree82cdec8572f39b44c83741d39fb6c2ada5e4b697
parentc9ad0595bb691fd763a0d12444bc40f005cbb795 (diff)
downloadlufa-8802907ce274489690f8edf169454f750c8efe57.tar.gz
lufa-8802907ce274489690f8edf169454f750c8efe57.tar.bz2
lufa-8802907ce274489690f8edf169454f750c8efe57.zip
Fix CDC device driver not returning written character on putchar success.
-rw-r--r--LUFA/DoxygenPages/ChangeLog.txt2
-rw-r--r--LUFA/Drivers/USB/Class/Device/CDCClassDevice.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt
index da8a6582e..8f299f7ea 100644
--- a/LUFA/DoxygenPages/ChangeLog.txt
+++ b/LUFA/DoxygenPages/ChangeLog.txt
@@ -10,6 +10,8 @@
* <b>Fixed:</b>
* - Core:
* - Fixed DeviceUsesOUTPipe flag not being set correctly in the HID host class driver (thanks to Wolfgang Schnerring)
+ * - Fixed CDC Device class driver's internal serial stream created by \ref CDC_Device_CreateStream not returning the written
+ * character after a successful write (thanks to NicoHood)
* - Library Applications:
* - Fixed bootloaders not disabling global interrupts during erase and write operations (thanks to Zoltan)
*
diff --git a/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c b/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c
index 27f8e722c..bf6e30141 100644
--- a/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c
+++ b/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c
@@ -323,7 +323,7 @@ void CDC_Device_CreateBlockingStream(USB_ClassInfo_CDC_Device_t* const CDCInterf
static int CDC_Device_putchar(char c,
FILE* Stream)
{
- return CDC_Device_SendByte((USB_ClassInfo_CDC_Device_t*)fdev_get_udata(Stream), c) ? _FDEV_ERR : 0;
+ return CDC_Device_SendByte((USB_ClassInfo_CDC_Device_t*)fdev_get_udata(Stream), c) ? _FDEV_ERR : c;
}
static int CDC_Device_getchar(FILE* Stream)