Merge branch 'ide-1.5.x' into ide-1.5.x-avr-toolchain-gcc-4.8.1

Federico Fissore · Federico Fissore · commit e2de88c731f1 · 2014-04-23T22:00:14.000+02:00
diff --git a/hardware/arduino/avr/cores/arduino/Arduino.h b/hardware/arduino/avr/cores/arduino/Arduino.h
@@ -21,6 +21,7 @@
 #define Arduino_h
 
 #include <stdlib.h>
+#include <stdbool.h>
 #include <string.h>
 #include <math.h>
 
@@ -43,9 +44,6 @@ void yield(void);
 #define OUTPUT 0x1
 #define INPUT_PULLUP 0x2
 
-#define true 0x1
-#define false 0x0
-
 #define PI 3.1415926535897932384626433832795
 #define HALF_PI 1.5707963267948966192313216916398
 #define TWO_PI 6.283185307179586476925286766559
diff --git a/hardware/arduino/avr/cores/arduino/CDC.cpp b/hardware/arduino/avr/cores/arduino/CDC.cpp
@@ -115,11 +115,11 @@ bool WEAK CDC_Setup(Setup& setup)
 
 
 int _serialPeek = -1;
-void Serial_::begin(unsigned long baud_count)
+void Serial_::begin(unsigned long /* baud_count */)
 {
 }
 
-void Serial_::begin(unsigned long baud_count, byte config)
+void Serial_::begin(unsigned long /* baud_count */, byte /* config */)
 {
 }
 
diff --git a/hardware/arduino/avr/cores/arduino/HID.cpp b/hardware/arduino/avr/cores/arduino/HID.cpp
@@ -151,7 +151,7 @@ int WEAK HID_GetInterface(u8* interfaceNum)
 	return USB_SendControl(TRANSFER_PGM,&_hidInterface,sizeof(_hidInterface));
 }
 
-int WEAK HID_GetDescriptor(int i)
+int WEAK HID_GetDescriptor(int /* i */)
 {
 	return USB_SendControl(TRANSFER_PGM,_hidReportDescriptor,sizeof(_hidReportDescriptor));
 }
@@ -510,11 +510,11 @@ void Keyboard_::releaseAll(void)
 
 size_t Keyboard_::write(uint8_t c)
 {	
-	uint8_t p = press(c);		// Keydown
-	uint8_t r = release(c);		// Keyup
-	return (p);					// just return the result of press() since release() almost always returns 1
+	uint8_t p = press(c);  // Keydown
+	release(c);            // Keyup
+	return p;              // just return the result of press() since release() almost always returns 1
 }
 
 #endif
 
-#endif /* if defined(USBCON) */
+#endif /* if defined(USBCON) */
diff --git a/hardware/arduino/avr/cores/arduino/IPAddress.cpp b/hardware/arduino/avr/cores/arduino/IPAddress.cpp
@@ -22,53 +22,53 @@
 
 IPAddress::IPAddress()
 {
-    memset(_address, 0, sizeof(_address));
+    _address.dword = 0;
 }
 
 IPAddress::IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet)
 {
-    _address[0] = first_octet;
-    _address[1] = second_octet;
-    _address[2] = third_octet;
-    _address[3] = fourth_octet;
+    _address.bytes[0] = first_octet;
+    _address.bytes[1] = second_octet;
+    _address.bytes[2] = third_octet;
+    _address.bytes[3] = fourth_octet;
 }
 
 IPAddress::IPAddress(uint32_t address)
 {
-    memcpy(_address, &address, sizeof(_address));
+    _address.dword = address;
 }
 
 IPAddress::IPAddress(const uint8_t *address)
 {
-    memcpy(_address, address, sizeof(_address));
+    memcpy(_address.bytes, address, sizeof(_address.bytes));
 }
 
 IPAddress& IPAddress::operator=(const uint8_t *address)
 {
-    memcpy(_address, address, sizeof(_address));
+    memcpy(_address.bytes, address, sizeof(_address.bytes));
     return *this;
 }
 
 IPAddress& IPAddress::operator=(uint32_t address)
 {
-    memcpy(_address, (const uint8_t *)&address, sizeof(_address));
+    _address.dword = address;
     return *this;
 }
 
 bool IPAddress::operator==(const uint8_t* addr) const
 {
-    return memcmp(addr, _address, sizeof(_address)) == 0;
+    return memcmp(addr, _address.bytes, sizeof(_address.bytes)) == 0;
 }
 
 size_t IPAddress::printTo(Print& p) const
 {
     size_t n = 0;
     for (int i =0; i < 3; i++)
     {
-        n += p.print(_address[i], DEC);
+        n += p.print(_address.bytes[i], DEC);
         n += p.print('.');
     }
-    n += p.print(_address[3], DEC);
+    n += p.print(_address.bytes[3], DEC);
     return n;
 }
 
diff --git a/hardware/arduino/avr/cores/arduino/IPAddress.h b/hardware/arduino/avr/cores/arduino/IPAddress.h
@@ -27,12 +27,16 @@
 
 class IPAddress : public Printable {
 private:
-    uint8_t _address[4];  // IPv4 address
+    union {
+	uint8_t bytes[4];  // IPv4 address
+	uint32_t dword;
+    } _address;
+
     // Access the raw byte array containing the address.  Because this returns a pointer
     // to the internal structure rather than a copy of the address this function should only
     // be used when you know that the usage of the returned uint8_t* will be transient and not
     // stored.
-    uint8_t* raw_address() { return _address; };
+    uint8_t* raw_address() { return _address.bytes; };
 
 public:
     // Constructors
@@ -43,13 +47,13 @@ class IPAddress : public Printable {
 
     // Overloaded cast operator to allow IPAddress objects to be used where a pointer
     // to a four-byte uint8_t array is expected
-    operator uint32_t() const { return *((uint32_t*)_address); };
-    bool operator==(const IPAddress& addr) const { return (*((uint32_t*)_address)) == (*((uint32_t*)addr._address)); };
+    operator uint32_t() const { return _address.dword; };
+    bool operator==(const IPAddress& addr) const { return _address.dword == addr._address.dword; };
     bool operator==(const uint8_t* addr) const;
 
     // Overloaded index operator to allow getting and setting individual octets of the address
-    uint8_t operator[](int index) const { return _address[index]; };
-    uint8_t& operator[](int index) { return _address[index]; };
+    uint8_t operator[](int index) const { return _address.bytes[index]; };
+    uint8_t& operator[](int index) { return _address.bytes[index]; };
 
     // Overloaded copy operators to allow initialisation of IPAddress objects from other types
     IPAddress& operator=(const uint8_t *address);
diff --git a/hardware/arduino/avr/cores/arduino/Stream.cpp b/hardware/arduino/avr/cores/arduino/Stream.cpp
@@ -176,7 +176,7 @@ float Stream::parseFloat(char skipChar){
   boolean isNegative = false;
   boolean isFraction = false;
   long value = 0;
-  char c;
+  int c;
   float fraction = 1.0;
 
   c = peekNextDigit();
diff --git a/hardware/arduino/avr/cores/arduino/USBCore.cpp b/hardware/arduino/avr/cores/arduino/USBCore.cpp
@@ -57,12 +57,18 @@ const u16 STRING_LANGUAGE[2] = {
 const u8 STRING_PRODUCT[] PROGMEM = USB_PRODUCT;
 
 #if USB_VID == 0x2341
-#define USB_MANUFACTURER "Arduino LLC"
+#  if defined(USB_MANUFACTURER)
+#    undef USB_MANUFACTURER
+#  endif
+#  define USB_MANUFACTURER "Arduino LLC"
 #elif USB_VID == 0x1b4f
-#define USB_MANUFACTURER "SparkFun"
+#  if defined(USB_MANUFACTURER)
+#    undef USB_MANUFACTURER
+#  endif
+#  define USB_MANUFACTURER "SparkFun"
 #elif !defined(USB_MANUFACTURER)
 // Fall through to unknown if no manufacturer name was provided in a macro
-#define USB_MANUFACTURER "Unknown"
+#  define USB_MANUFACTURER "Unknown"
 #endif
 
 const u8 STRING_MANUFACTURER[] PROGMEM = USB_MANUFACTURER;
@@ -88,7 +94,8 @@ volatile u8 _usbConfiguration = 0;
 
 static inline void WaitIN(void)
 {
-	while (!(UEINTX & (1<<TXINI)));
+	while (!(UEINTX & (1<<TXINI)))
+		;
 }
 
 static inline void ClearIN(void)
@@ -268,7 +275,6 @@ int USB_Send(u8 ep, const void* d, int len)
 
 	int r = len;
 	const u8* data = (const u8*)d;
-	u8 zero = ep & TRANSFER_ZERO;
 	u8 timeout = 250;		// 250ms timeout on send? TODO
 	while (len)
 	{
diff --git a/hardware/arduino/sam/cores/arduino/IPAddress.cpp b/hardware/arduino/sam/cores/arduino/IPAddress.cpp
@@ -22,53 +22,53 @@
 
 IPAddress::IPAddress()
 {
-    memset(_address, 0, sizeof(_address));
+    _address.dword = 0;
 }
 
 IPAddress::IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet)
 {
-    _address[0] = first_octet;
-    _address[1] = second_octet;
-    _address[2] = third_octet;
-    _address[3] = fourth_octet;
+    _address.bytes[0] = first_octet;
+    _address.bytes[1] = second_octet;
+    _address.bytes[2] = third_octet;
+    _address.bytes[3] = fourth_octet;
 }
 
 IPAddress::IPAddress(uint32_t address)
 {
-    memcpy(_address, &address, sizeof(_address));
+    _address.dword = address;
 }
 
 IPAddress::IPAddress(const uint8_t *address)
 {
-    memcpy(_address, address, sizeof(_address));
+    memcpy(_address.bytes, address, sizeof(_address.bytes));
 }
 
 IPAddress& IPAddress::operator=(const uint8_t *address)
 {
-    memcpy(_address, address, sizeof(_address));
+    memcpy(_address.bytes, address, sizeof(_address.bytes));
     return *this;
 }
 
 IPAddress& IPAddress::operator=(uint32_t address)
 {
-    memcpy(_address, (const uint8_t *)&address, sizeof(_address));
+    _address.dword = address;
     return *this;
 }
 
 bool IPAddress::operator==(const uint8_t* addr) const
 {
-    return memcmp(addr, _address, sizeof(_address)) == 0;
+    return memcmp(addr, _address.bytes, sizeof(_address.bytes)) == 0;
 }
 
 size_t IPAddress::printTo(Print& p) const
 {
     size_t n = 0;
     for (int i =0; i < 3; i++)
     {
-        n += p.print(_address[i], DEC);
+        n += p.print(_address.bytes[i], DEC);
         n += p.print('.');
     }
-    n += p.print(_address[3], DEC);
+    n += p.print(_address.bytes[3], DEC);
     return n;
 }
 
diff --git a/hardware/arduino/sam/cores/arduino/IPAddress.h b/hardware/arduino/sam/cores/arduino/IPAddress.h
@@ -20,18 +20,23 @@
 #ifndef IPAddress_h
 #define IPAddress_h
 
+#include <stdint.h>
 #include <Printable.h>
 
 // A class to make it easier to handle and pass around IP addresses
 
 class IPAddress : public Printable {
 private:
-    uint8_t _address[4];  // IPv4 address
+    union {
+	uint8_t bytes[4];  // IPv4 address
+	uint32_t dword;
+    } _address;
+
     // Access the raw byte array containing the address.  Because this returns a pointer
     // to the internal structure rather than a copy of the address this function should only
     // be used when you know that the usage of the returned uint8_t* will be transient and not
     // stored.
-    uint8_t* raw_address() { return _address; };
+    uint8_t* raw_address() { return _address.bytes; };
 
 public:
     // Constructors
@@ -42,13 +47,13 @@ class IPAddress : public Printable {
 
     // Overloaded cast operator to allow IPAddress objects to be used where a pointer
     // to a four-byte uint8_t array is expected
-    operator uint32_t() const { return *((uint32_t*)_address); };
-    bool operator==(const IPAddress& addr) const { return (*((uint32_t*)_address)) == (*((uint32_t*)addr._address)); };
+    operator uint32_t() const { return _address.dword; };
+    bool operator==(const IPAddress& addr) const { return _address.dword == addr._address.dword; };
     bool operator==(const uint8_t* addr) const;
 
     // Overloaded index operator to allow getting and setting individual octets of the address
-    uint8_t operator[](int index) const { return _address[index]; };
-    uint8_t& operator[](int index) { return _address[index]; };
+    uint8_t operator[](int index) const { return _address.bytes[index]; };
+    uint8_t& operator[](int index) { return _address.bytes[index]; };
 
     // Overloaded copy operators to allow initialisation of IPAddress objects from other types
     IPAddress& operator=(const uint8_t *address);
diff --git a/hardware/arduino/sam/cores/arduino/Stream.cpp b/hardware/arduino/sam/cores/arduino/Stream.cpp
@@ -176,7 +176,7 @@ float Stream::parseFloat(char skipChar){
   boolean isNegative = false;
   boolean isFraction = false;
   long value = 0;
-  char c;
+  int c;
   float fraction = 1.0;
 
   c = peekNextDigit();
diff --git a/hardware/arduino/sam/cores/arduino/USB/CDC.cpp b/hardware/arduino/sam/cores/arduino/USB/CDC.cpp
@@ -147,10 +147,15 @@ bool WEAK CDC_Setup(Setup& setup)
 int _serialPeek = -1;
 void Serial_::begin(uint32_t baud_count)
 {
+	// suppress "unused parameter" warning
+	(void)baud_count;
 }
 
 void Serial_::begin(uint32_t baud_count, uint8_t config)
 {
+	// suppress "unused parameter" warning
+	(void)baud_count;
+	(void)config;
 }
 
 void Serial_::end(void)
diff --git a/hardware/arduino/sam/cores/arduino/USB/USBCore.cpp b/hardware/arduino/sam/cores/arduino/USB/USBCore.cpp
@@ -69,10 +69,13 @@ const uint16_t STRING_LANGUAGE[2] = {
 const uint8_t STRING_PRODUCT[] = USB_PRODUCT;
 
 #if USB_VID == 0x2341
-#define USB_MANUFACTURER "Arduino LLC"
+#  if defined(USB_MANUFACTURER)
+#    undef USB_MANUFACTURER
+#  endif
+#  define USB_MANUFACTURER "Arduino LLC"
 #elif !defined(USB_MANUFACTURER)
 // Fall through to unknown if no manufacturer name was provided in a macro
-#define USB_MANUFACTURER "Unknown"
+#  define USB_MANUFACTURER "Unknown"
 #endif
 
 const uint8_t STRING_MANUFACTURER[12] = USB_MANUFACTURER;
@@ -139,7 +142,7 @@ uint32_t USBD_Available(uint32_t ep)
 //	Return number of bytes read
 uint32_t USBD_Recv(uint32_t ep, void* d, uint32_t len)
 {
-	if (!_usbConfiguration || len < 0)
+	if (!_usbConfiguration)
 		return -1;
 
 	LockEP lock(ep);
diff --git a/hardware/arduino/sam/cores/arduino/avr/dtostrf.c b/hardware/arduino/sam/cores/arduino/avr/dtostrf.c
@@ -18,6 +18,8 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+#include <stdio.h>
+
 char *dtostrf (double val, signed char width, unsigned char prec, char *sout) {
   char fmt[20];
   sprintf(fmt, "%%%d.%df", width, prec);
diff --git a/hardware/arduino/sam/cores/arduino/syscalls_sam3.c b/hardware/arduino/sam/cores/arduino/syscalls_sam3.c
diff --git a/hardware/arduino/sam/cores/arduino/wiring_analog.c b/hardware/arduino/sam/cores/arduino/wiring_analog.c
diff --git a/hardware/arduino/sam/variants/arduino_due_x/variant.cpp b/hardware/arduino/sam/variants/arduino_due_x/variant.cpp
diff --git a/libraries/Ethernet/src/Ethernet.cpp b/libraries/Ethernet/src/Ethernet.cpp
diff --git a/libraries/SD/src/SD.cpp b/libraries/SD/src/SD.cpp
diff --git a/libraries/SD/src/utility/Sd2Card.cpp b/libraries/SD/src/utility/Sd2Card.cpp

Original file line number	Diff line number	Diff line change
`@@ -115,11 +115,11 @@ bool WEAK CDC_Setup(Setup& setup)`
`115`	`115`
`116`	`116`
`117`	`117`	`int _serialPeek = -1;`
`118`		`-void Serial_::begin(unsigned long baud_count)`
	`118`	`+void Serial_::begin(unsigned long /* baud_count */)`
`119`	`119`	`{`
`120`	`120`	`}`
`121`	`121`
`122`		`-void Serial_::begin(unsigned long baud_count, byte config)`
	`122`	`+void Serial_::begin(unsigned long /* baud_count /, byte / config */)`
`123`	`123`	`{`
`124`	`124`	`}`
`125`	`125`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ int WEAK HID_GetInterface(u8* interfaceNum)`
`151`	`151`	`return USB_SendControl(TRANSFER_PGM,&_hidInterface,sizeof(_hidInterface));`
`152`	`152`	`}`
`153`	`153`
`154`		`-int WEAK HID_GetDescriptor(int i)`
	`154`	`+int WEAK HID_GetDescriptor(int /* i */)`
`155`	`155`	`{`
`156`	`156`	`return USB_SendControl(TRANSFER_PGM,_hidReportDescriptor,sizeof(_hidReportDescriptor));`
`157`	`157`	`}`
`@@ -510,11 +510,11 @@ void Keyboard_::releaseAll(void)`
`510`	`510`
`511`	`511`	`size_t Keyboard_::write(uint8_t c)`
`512`	`512`	`{`
`513`		`- uint8_t p = press(c); // Keydown`
`514`		`- uint8_t r = release(c); // Keyup`
`515`		`- return (p); // just return the result of press() since release() almost always returns 1`
	`513`	`+ uint8_t p = press(c); // Keydown`
	`514`	`+ release(c); // Keyup`
	`515`	`+ return p; // just return the result of press() since release() almost always returns 1`
`516`	`516`	`}`
`517`	`517`
`518`	`518`	`#endif`
`519`	`519`
`520`		`-#endif /* if defined(USBCON) */`
	`520`	`+#endif /* if defined(USBCON) */`
Original file line number	Diff line number	Diff line change
`@@ -22,53 +22,53 @@`
`22`	`22`
`23`	`23`	`IPAddress::IPAddress()`
`24`	`24`	`{`
`25`		`- memset(_address, 0, sizeof(_address));`
	`25`	`+ _address.dword = 0;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`IPAddress::IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet)`
`29`	`29`	`{`
`30`		`- _address[0] = first_octet;`
`31`		`- _address[1] = second_octet;`
`32`		`- _address[2] = third_octet;`
`33`		`- _address[3] = fourth_octet;`
	`30`	`+ _address.bytes[0] = first_octet;`
	`31`	`+ _address.bytes[1] = second_octet;`
	`32`	`+ _address.bytes[2] = third_octet;`
	`33`	`+ _address.bytes[3] = fourth_octet;`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`IPAddress::IPAddress(uint32_t address)`
`37`	`37`	`{`
`38`		`- memcpy(_address, &address, sizeof(_address));`
	`38`	`+ _address.dword = address;`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`IPAddress::IPAddress(const uint8_t *address)`
`42`	`42`	`{`
`43`		`- memcpy(_address, address, sizeof(_address));`
	`43`	`+ memcpy(_address.bytes, address, sizeof(_address.bytes));`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`IPAddress& IPAddress::operator=(const uint8_t *address)`
`47`	`47`	`{`
`48`		`- memcpy(_address, address, sizeof(_address));`
	`48`	`+ memcpy(_address.bytes, address, sizeof(_address.bytes));`
`49`	`49`	`return *this;`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`IPAddress& IPAddress::operator=(uint32_t address)`
`53`	`53`	`{`
`54`		`- memcpy(_address, (const uint8_t *)&address, sizeof(_address));`
	`54`	`+ _address.dword = address;`
`55`	`55`	`return *this;`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`bool IPAddress::operator==(const uint8_t* addr) const`
`59`	`59`	`{`
`60`		`- return memcmp(addr, _address, sizeof(_address)) == 0;`
	`60`	`+ return memcmp(addr, _address.bytes, sizeof(_address.bytes)) == 0;`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`size_t IPAddress::printTo(Print& p) const`
`64`	`64`	`{`
`65`	`65`	`size_t n = 0;`
`66`	`66`	`for (int i =0; i < 3; i++)`
`67`	`67`	`{`
`68`		`- n += p.print(_address[i], DEC);`
	`68`	`+ n += p.print(_address.bytes[i], DEC);`
`69`	`69`	`n += p.print('.');`
`70`	`70`	`}`
`71`		`- n += p.print(_address[3], DEC);`
	`71`	`+ n += p.print(_address.bytes[3], DEC);`
`72`	`72`	`return n;`
`73`	`73`	`}`
`74`	`74`