make it so native USB is Serial

Author: ladyada

cores/arduino/USB/CDC.cpp

@@ -243,6 +243,7 @@ Serial_::operator bool()
 	return result;
 }
 
+<<<<<<< HEAD
 int32_t Serial_::readBreak() {
 	uint8_t enableInterrupts = ((__get_PRIMASK() & 0x1) == 0);
 
@@ -288,5 +289,8 @@ bool Serial_::rts() {
 }
 
 Serial_ SerialUSB(USBDevice);
+=======
+Serial_ Serial(USBDevice);
+>>>>>>> make it so native USB is Serial
 
 #endif

cores/arduino/USB/USBAPI.h

@@ -177,7 +177,7 @@ class Serial_ : public Stream
 	RingBuffer *_cdc_rx_buffer;
 	bool stalled;
 };
-extern Serial_ SerialUSB;
+extern Serial_ Serial;
 
 //================================================================================
 //================================================================================

cores/arduino/USB/USBCore.cpp

@@ -280,6 +280,15 @@ void USBDeviceClass::standby() {
 void USBDeviceClass::handleEndpoint(uint8_t ep)
 {
 #if defined(CDC_ENABLED)
+	if (ep == CDC_ENDPOINT_OUT)
+	{
+		// The RAM Buffer is empty: we can receive data
+		//usbd.epBank0ResetReady(CDC_ENDPOINT_OUT);
+
+		// Handle received bytes
+		if (available(CDC_ENDPOINT_OUT))
+			Serial.accept();
+	}
 	if (ep == CDC_ENDPOINT_IN)
 	{
 		// NAK on endpoint IN, the bank is not yet filled in.

variants/arduino_zero/variant.cpp

@@ -208,14 +208,14 @@ SERCOM sercom4( SERCOM4 ) ;
 SERCOM sercom5( SERCOM5 ) ;
 
 Uart Serial1( &sercom0, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;
-Uart Serial( &sercom5, PIN_SERIAL_RX, PIN_SERIAL_TX, PAD_SERIAL_RX, PAD_SERIAL_TX ) ;
+Uart Serial5( &sercom5, PIN_SERIAL_RX, PIN_SERIAL_TX, PAD_SERIAL_RX, PAD_SERIAL_TX ) ;
 void SERCOM0_Handler()
 {
   Serial1.IrqHandler();
 }
 
 void SERCOM5_Handler()
 {
-  Serial.IrqHandler();
+  Serial5.IrqHandler();
 }
 

variants/arduino_zero/variant.h

@@ -197,7 +197,7 @@ extern SERCOM sercom3;
 extern SERCOM sercom4;
 extern SERCOM sercom5;
 
-extern Uart Serial;
+extern Uart Serial5;
 extern Uart Serial1;
 
 #endif
@@ -217,7 +217,7 @@ extern Uart Serial1;
 //
 // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
 //                            pins are NOT connected to anything by default.
-#define SERIAL_PORT_USBVIRTUAL      SerialUSB
+#define SERIAL_PORT_USBVIRTUAL      Serial
 #define SERIAL_PORT_MONITOR         Serial
 // Serial has no physical pins broken out, so it's not listed as HARDWARE port
 #define SERIAL_PORT_HARDWARE        Serial1