rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-17 06:52:18 +01:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Cristian Maglie 2013-09-30 16:10:59 +02:00
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; 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: private:
ring_buffer *_cdc_rx_buffer; ring_buffer *_cdc_rx_buffer;
public: public:
void begin(uint16_t baud_count); void begin(unsigned long);
void begin(unsigned long, uint8_t);
void end(void); void end(void);
virtual int available(void); virtual int available(void);
@ -193,4 +194,4 @@ void USB_Flush(uint8_t ep);
#endif #endif
#endif /* if defined(USBCON) */ #endif /* if defined(USBCON) */