Merge pull request #1863 from matthijskooijman/ide-1.5.x-serial-int

cmaglie · cmaglie · commit 92958ef4cbfc · 2014-02-14T15:42:26.000+01:00
In HardwareSerial, don't use int for buffer indices
diff --git a/hardware/arduino/avr/cores/arduino/HardwareSerial.cpp b/hardware/arduino/avr/cores/arduino/HardwareSerial.cpp
@@ -171,7 +171,7 @@ int HardwareSerial::read(void)
     return -1;
   } else {
     unsigned char c = _rx_buffer[_rx_buffer_tail];
-    _rx_buffer_tail = (unsigned int)(_rx_buffer_tail + 1) % SERIAL_BUFFER_SIZE;
+    _rx_buffer_tail = (uint8_t)(_rx_buffer_tail + 1) % SERIAL_BUFFER_SIZE;
     return c;
   }
 }
@@ -207,7 +207,7 @@ size_t HardwareSerial::write(uint8_t c)
     sbi(*_ucsra, TXC0);
     return 1;
   }
-  int i = (_tx_buffer_head + 1) % SERIAL_BUFFER_SIZE;
+  uint8_t i = (_tx_buffer_head + 1) % SERIAL_BUFFER_SIZE;
 	
   // If the output buffer is full, there's nothing for it other than to 
   // wait for the interrupt handler to empty it a bit

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ int HardwareSerial::read(void)`
`171`	`171`	`return -1;`
`172`	`172`	`} else {`
`173`	`173`	`unsigned char c = _rx_buffer[_rx_buffer_tail];`
`174`		`- _rx_buffer_tail = (unsigned int)(_rx_buffer_tail + 1) % SERIAL_BUFFER_SIZE;`
	`174`	`+ _rx_buffer_tail = (uint8_t)(_rx_buffer_tail + 1) % SERIAL_BUFFER_SIZE;`
`175`	`175`	`return c;`
`176`	`176`	`}`
`177`	`177`	`}`
`@@ -207,7 +207,7 @@ size_t HardwareSerial::write(uint8_t c)`
`207`	`207`	`sbi(*_ucsra, TXC0);`
`208`	`208`	`return 1;`
`209`	`209`	`}`
`210`		`- int i = (_tx_buffer_head + 1) % SERIAL_BUFFER_SIZE;`
	`210`	`+ uint8_t i = (_tx_buffer_head + 1) % SERIAL_BUFFER_SIZE;`
`211`	`211`
`212`	`212`	`// If the output buffer is full, there's nothing for it other than to`
`213`	`213`	`// wait for the interrupt handler to empty it a bit`