noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Cristian Maglie 2013-09-30 16:10:59 +02:00
parent 5615e20f3c f53fcdd254
commit a0b9d95065
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hardware/arduino/cores/arduino/CDC.cpp
View File

@ -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)
{
}

5
hardware/arduino/cores/arduino/USBAPI.h
View File

@ -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) */