Merge branch 'usb-serial-begin' of github.com:pbrook/Arduino into pbrook-usb-serial-begin

Author: cmaglie

hardware/arduino/cores/arduino/CDC.cpp

@@ -130,7 +130,11 @@ bool WEAK CDC_Setup(Setup& setup)
 
 
 int _serialPeek = -1;
-void Serial_::begin(uint16_t baud_count)
+void Serial_::begin(unsigned long baud_count)
+{
+}
+
+void Serial_::begin(unsigned long baud_count, byte config)
 {
 }
 

hardware/arduino/cores/arduino/USBAPI.h

@@ -30,7 +30,8 @@ class Serial_ : public Stream
 private:
 	ring_buffer *_cdc_rx_buffer;
 public:
-	void begin(uint16_t baud_count);
+	void begin(unsigned long);
+	void begin(unsigned long, uint8_t);
 	void end(void);
 
 	virtual int available(void);
@@ -193,4 +194,4 @@ void USB_Flush(uint8_t ep);
 
 #endif
 
-#endif /* if defined(USBCON) */
+#endif /* if defined(USBCON) */