aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Eveland <zeveland@blacklabel-development.com>2012-02-03 19:54:33 -0500
committerZach Eveland <zeveland@blacklabel-development.com>2012-02-03 19:54:33 -0500
commita794f295e03afe2a9b1ed4534ffa4f4a827e5cd9 (patch)
tree57c99f987f2f3c954ee04d21f31b7cdf0c2af59d
parent45d3b102956c74f837eb0297af45939ca46b09a0 (diff)
parente1438efb3a6d538ae3fd0e2037ec2b112aa1c563 (diff)
Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader
-rw-r--r--cores/arduino/HardwareSerial.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cores/arduino/HardwareSerial.cpp b/cores/arduino/HardwareSerial.cpp
index 1b1fa71..9985b78 100644
--- a/cores/arduino/HardwareSerial.cpp
+++ b/cores/arduino/HardwareSerial.cpp
@@ -46,8 +46,8 @@
struct ring_buffer
{
unsigned char buffer[SERIAL_BUFFER_SIZE];
- volatile int head;
- volatile int tail;
+ volatile unsigned int head;
+ volatile unsigned int tail;
};
#if defined(USBCON)