Merge branch 'master' into ide-1.5.x

cmaglie · cmaglie · commit d7ed6ec36174 · 2013-09-30T16:25:10.000+02:00
diff --git a/cores/arduino/CDC.cpp b/cores/arduino/CDC.cpp
@@ -115,7 +115,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)
 {
 }
 
diff --git a/cores/arduino/USBAPI.h b/cores/arduino/USBAPI.h
@@ -36,7 +36,8 @@ struct ring_buffer;
 class Serial_ : public Stream
 {
 public:
-	void begin(uint16_t baud_count);
+	void begin(unsigned long);
+	void begin(unsigned long, uint8_t);
 	void end(void);
 
 	virtual int available(void);

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,11 @@ bool WEAK CDC_Setup(Setup& setup)`
`115`	`115`
`116`	`116`
`117`	`117`	`int _serialPeek = -1;`
`118`		`-void Serial_::begin(uint16_t baud_count)`
	`118`	`+void Serial_::begin(unsigned long baud_count)`
	`119`	`+{`
	`120`	`+}`
	`121`	`+`
	`122`	`+void Serial_::begin(unsigned long baud_count, byte config)`
`119`	`123`	`{`
`120`	`124`	`}`
`121`	`125`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@ struct ring_buffer;`
`36`	`36`	`class Serial_ : public Stream`
`37`	`37`	`{`
`38`	`38`	`public:`
`39`		`- void begin(uint16_t baud_count);`
	`39`	`+ void begin(unsigned long);`
	`40`	`+ void begin(unsigned long, uint8_t);`
`40`	`41`	`void end(void);`
`41`	`42`
`42`	`43`	`virtual int available(void);`