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

Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader

Browse Source
This commit is contained in:
Zach Eveland 2012-02-03 19:54:33 -05:00
commit 5eb7ad154b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hardware/arduino/cores/arduino/HardwareSerial.cpp
View File

@ -46,8 +46,8 @@
struct ring_buffer struct ring_buffer
{ {
unsigned char buffer[SERIAL_BUFFER_SIZE]; unsigned char buffer[SERIAL_BUFFER_SIZE];
volatile int head; volatile unsigned int head;
volatile int tail; volatile unsigned int tail;
}; };
#if defined(USBCON) #if defined(USBCON)

2
libraries/SD/utility/SdFatUtil.h
View File

@ -56,7 +56,7 @@ static UNUSEDOK int FreeRam(void) {
* \param[in] str Pointer to string stored in flash memory. * \param[in] str Pointer to string stored in flash memory.
*/ */
static NOINLINE void SerialPrint_P(PGM_P str) { static NOINLINE void SerialPrint_P(PGM_P str) {
for (uint8_t c; (c = pgm_read_byte(str)); str++) Serial.print(c); for (uint8_t c; (c = pgm_read_byte(str)); str++) Serial.write(c);
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
/** /**