make it so native USB is Serial

ladyada · ladyada · commit 5c7319f52f2d · 2016-01-13T15:59:44.000-05:00
diff --git a/cores/arduino/USB/CDC.cpp b/cores/arduino/USB/CDC.cpp
@@ -289,6 +289,6 @@ Serial_::operator bool()
 	return result;
 }
 
-Serial_ SerialUSB(USBDevice);
+Serial_ Serial(USBDevice);
 
 #endif
diff --git a/cores/arduino/USB/USBAPI.h b/cores/arduino/USB/USBAPI.h
@@ -130,7 +130,7 @@ class Serial_ : public Stream
 	USBDeviceClass &usb;
 	RingBuffer *_cdc_rx_buffer;
 };
-extern Serial_ SerialUSB;
+extern Serial_ Serial;
 
 //================================================================================
 //================================================================================
diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
@@ -250,7 +250,7 @@ void USBDeviceClass::handleEndpoint(uint8_t ep)
 
 		// Handle received bytes
 		if (available(CDC_ENDPOINT_OUT))
-			SerialUSB.accept();
+			Serial.accept();
 	}
 	if (ep == CDC_ENDPOINT_IN)
 	{
diff --git a/variants/arduino_zero/variant.cpp b/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();
 }
 
diff --git a/variants/arduino_zero/variant.h b/variants/arduino_zero/variant.h
@@ -183,7 +183,7 @@ extern SERCOM sercom3;
 extern SERCOM sercom4;
 extern SERCOM sercom5;
 
-extern Uart Serial;
+extern Uart Serial5;
 extern Uart Serial1;
 
 #endif
@@ -203,7 +203,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

Original file line number	Diff line number	Diff line change
`@@ -289,6 +289,6 @@ Serial_::operator bool()`
`289`	`289`	`return result;`
`290`	`290`	`}`
`291`	`291`
`292`		`-Serial_ SerialUSB(USBDevice);`
	`292`	`+Serial_ Serial(USBDevice);`
`293`	`293`
`294`	`294`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ void USBDeviceClass::handleEndpoint(uint8_t ep)`
`250`	`250`
`251`	`251`	`// Handle received bytes`
`252`	`252`	`if (available(CDC_ENDPOINT_OUT))`
`253`		`- SerialUSB.accept();`
	`253`	`+ Serial.accept();`
`254`	`254`	`}`
`255`	`255`	`if (ep == CDC_ENDPOINT_IN)`
`256`	`256`	`{`
Original file line number	Diff line number	Diff line change
`@@ -208,14 +208,14 @@ SERCOM sercom4( SERCOM4 ) ;`
`208`	`208`	`SERCOM sercom5( SERCOM5 ) ;`
`209`	`209`
`210`	`210`	`Uart Serial1( &sercom0, PIN_SERIAL1_RX, PIN_SERIAL1_TX, PAD_SERIAL1_RX, PAD_SERIAL1_TX ) ;`
`211`		`-Uart Serial( &sercom5, PIN_SERIAL_RX, PIN_SERIAL_TX, PAD_SERIAL_RX, PAD_SERIAL_TX ) ;`
	`211`	`+Uart Serial5( &sercom5, PIN_SERIAL_RX, PIN_SERIAL_TX, PAD_SERIAL_RX, PAD_SERIAL_TX ) ;`
`212`	`212`	`void SERCOM0_Handler()`
`213`	`213`	`{`
`214`	`214`	`Serial1.IrqHandler();`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`void SERCOM5_Handler()`
`218`	`218`	`{`
`219`		`- Serial.IrqHandler();`
	`219`	`+ Serial5.IrqHandler();`
`220`	`220`	`}`
`221`	`221`