Add 1 to available() if peek has been previously called

facchinm · facchinm · commit c8094e7a37bc · 2019-04-29T14:24:40.000+02:00
Fixes #405; a proper fix require to use another RingBuffer (useless since the USB data is already internally buffered)
diff --git a/cores/arduino/USB/CDC.cpp b/cores/arduino/USB/CDC.cpp
@@ -199,9 +199,11 @@ void Serial_::end(void)
 	memset((void*)&_usbLineInfo, 0, sizeof(_usbLineInfo));
 }
 
+int _serialPeek = -1;
+
 int Serial_::available(void)
 {
-	return usb.available(CDC_ENDPOINT_OUT);
+	return usb.available(CDC_ENDPOINT_OUT) + (_serialPeek != -1);
 }
 
 int Serial_::availableForWrite(void)
@@ -211,8 +213,6 @@ int Serial_::availableForWrite(void)
 	return (EPX_SIZE - 1);
 }
 
-int _serialPeek = -1;
-
 int Serial_::peek(void)
 {
 	if (_serialPeek != -1)

Original file line number	Diff line number	Diff line change
`@@ -199,9 +199,11 @@ void Serial_::end(void)`
`199`	`199`	`memset((void*)&_usbLineInfo, 0, sizeof(_usbLineInfo));`
`200`	`200`	`}`
`201`	`201`
	`202`	`+int _serialPeek = -1;`
	`203`	`+`
`202`	`204`	`int Serial_::available(void)`
`203`	`205`	`{`
`204`		`- return usb.available(CDC_ENDPOINT_OUT);`
	`206`	`+ return usb.available(CDC_ENDPOINT_OUT) + (_serialPeek != -1);`
`205`	`207`	`}`
`206`	`208`
`207`	`209`	`int Serial_::availableForWrite(void)`
`@@ -211,8 +213,6 @@ int Serial_::availableForWrite(void)`
`211`	`213`	`return (EPX_SIZE - 1);`
`212`	`214`	`}`
`213`	`215`
`214`		`-int _serialPeek = -1;`
`215`		`-`
`216`	`216`	`int Serial_::peek(void)`
`217`	`217`	`{`
`218`	`218`	`if (_serialPeek != -1)`