Small optimization in HardwareSerial.

damellis · damellis · commit 8c0fdf1e43a2 · 2011-05-12T16:58:56.000-04:00
begin(long) -&gt; begin(unsigned long)

Conflicts:

	hardware/arduino/cores/arduino/HardwareSerial.h
diff --git a/hardware/arduino/cores/arduino/HardwareSerial.cpp b/hardware/arduino/cores/arduino/HardwareSerial.cpp
@@ -265,7 +265,7 @@ HardwareSerial::HardwareSerial(ring_buffer *rx_buffer, ring_buffer *tx_buffer,
 
 // Public Methods //////////////////////////////////////////////////////////////
 
-void HardwareSerial::begin(long baud)
+void HardwareSerial::begin(unsigned long baud)
 {
   uint16_t baud_setting;
   bool use_u2x = true;
diff --git a/hardware/arduino/cores/arduino/HardwareSerial.h b/hardware/arduino/cores/arduino/HardwareSerial.h
@@ -49,7 +49,7 @@ class HardwareSerial : public Stream
       volatile uint8_t *ucsra, volatile uint8_t *ucsrb,
       volatile uint8_t *udr,
       uint8_t rxen, uint8_t txen, uint8_t rxcie, uint8_t udrie, uint8_t u2x);
-    void begin(long);
+    void begin(unsigned long);
     void end();
     virtual int available(void);
     virtual int peek(void);

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ HardwareSerial::HardwareSerial(ring_buffer rx_buffer, ring_buffer tx_buffer,`
`265`	`265`
`266`	`266`	`// Public Methods //////////////////////////////////////////////////////////////`
`267`	`267`
`268`		`-void HardwareSerial::begin(long baud)`
	`268`	`+void HardwareSerial::begin(unsigned long baud)`
`269`	`269`	`{`
`270`	`270`	`uint16_t baud_setting;`
`271`	`271`	`bool use_u2x = true;`