Merged 1.0.5

Merge remote-tracking branch 'arduino/master' into ide-1.5.x

Conflicts:
	app/src/processing/app/Base.java
	build/shared/revisions.txt
	hardware/arduino/avr/cores/arduino/malloc.c
	hardware/arduino/cores/arduino/avr-libc/malloc.c
	hardware/arduino/cores/arduino/malloc.c
	todo.txt

1 files changed, 189 insertions, 0 deletions

diff --git a/bootloaders/stk500v2/avr_cpunames.h b/bootloaders/stk500v2/avr_cpunames.h
new file mode 100644
index 0000000..ad0ed9c
--- /dev/null
+++ b/bootloaders/stk500v2/avr_cpunames.h
@@ -0,0 +1,189 @@
+//**************************************************************************************************
+//*
+//*	Atmel AVR CPU name strings
+//*
+//**************************************************************************************************
+//*	Sep 19,	2010	<MLS> Started on avr_cpunames.h
+//**************************************************************************************************
+
+//#include	"avr_cpunames.h"
+
+//**************************************************************************************************
+
+
+#if defined (__AVR_AT94K__)
+									#define	_AVR_CPU_NAME_	"AT94k"
+#elif defined (__AVR_AT43USB320__)
+#elif defined (__AVR_AT43USB355__)
+#elif defined (__AVR_AT76C711__)
+#elif defined (__AVR_AT86RF401__)
+#elif defined (__AVR_AT90PWM1__)
+#elif defined (__AVR_AT90PWM2__)
+#elif defined (__AVR_AT90PWM2B__)
+#elif defined (__AVR_AT90PWM3__)
+#elif defined (__AVR_AT90PWM3B__)
+#elif defined (__AVR_AT90PWM216__)
+#elif defined (__AVR_AT90PWM316__)
+#elif defined (__AVR_ATmega32C1__)
+#elif defined (__AVR_ATmega32M1__)
+#elif defined (__AVR_ATmega32U4__)
+									#define	_AVR_CPU_NAME_	"ATmega32U4"
+#elif defined (__AVR_ATmega32U6__)
+									#define	_AVR_CPU_NAME_	"ATmega32U6"
+#elif defined (__AVR_ATmega128__)
+									#define	_AVR_CPU_NAME_	"Atmega128"
+#elif defined (__AVR_ATmega1280__)
+									#define	_AVR_CPU_NAME_	"ATmega1280"
+#elif defined (__AVR_ATmega1281__)
+									#define	_AVR_CPU_NAME_	"ATmega1281"
+#elif defined (__AVR_ATmega1284P__)
+									#define	_AVR_CPU_NAME_	"ATmega1284"
+#elif defined (__AVR_ATmega128RFA1__)
+									#define	_AVR_CPU_NAME_	"ATmega128RFA1"
+#elif defined (__AVR_ATmega2560__)
+									#define	_AVR_CPU_NAME_	"ATmega2560"
+#elif defined (__AVR_ATmega2561__)
+									#define	_AVR_CPU_NAME_	"ATmega2561"
+#elif defined (__AVR_AT90CAN32__)
+									#define	_AVR_CPU_NAME_	"AT90CAN32"
+#elif defined (__AVR_AT90CAN64__)
+									#define	_AVR_CPU_NAME_	"AT90CAN64"
+#elif defined (__AVR_AT90CAN128__)
+									#define	_AVR_CPU_NAME_	"AT90CAN128"
+#elif defined (__AVR_AT90USB82__)
+									#define	_AVR_CPU_NAME_	"AT90USB82"
+#elif defined (__AVR_AT90USB162__)
+									#define	_AVR_CPU_NAME_	"AT90USB162"
+#elif defined (__AVR_AT90USB646__)
+									#define	_AVR_CPU_NAME_	"AT90USB646"
+#elif defined (__AVR_AT90USB647__)
+									#define	_AVR_CPU_NAME_	"AT90USB647"
+#elif defined (__AVR_AT90USB1286__)
+									#define	_AVR_CPU_NAME_	"AT90USB1286"
+#elif defined (__AVR_AT90USB1287__)
+									#define	_AVR_CPU_NAME_	"AT90USB1287"
+#elif defined (__AVR_ATmega64__)
+									#define	_AVR_CPU_NAME_	"ATmega64"
+#elif defined (__AVR_ATmega640__)
+									#define	_AVR_CPU_NAME_	"ATmega640"
+#elif defined (__AVR_ATmega644__)
+									#define	_AVR_CPU_NAME_	"ATmega644"
+#elif defined (__AVR_ATmega644P__)
+									#define	_AVR_CPU_NAME_	"ATmega644P"
+#elif defined (__AVR_ATmega645__)
+									#define	_AVR_CPU_NAME_	"ATmega645"
+#elif defined (__AVR_ATmega6450__)
+									#define	_AVR_CPU_NAME_	"ATmega6450"
+#elif defined (__AVR_ATmega649__)
+									#define	_AVR_CPU_NAME_	"ATmega649"
+#elif defined (__AVR_ATmega6490__)
+									#define	_AVR_CPU_NAME_	"ATmega6490"
+#elif defined (__AVR_ATmega103__)
+									#define	_AVR_CPU_NAME_	"ATmega103"
+#elif defined (__AVR_ATmega32__)
+									#define	_AVR_CPU_NAME_	"Atmega32"
+#elif defined (__AVR_ATmega323__)
+									#define	_AVR_CPU_NAME_	"ATmega323"
+#elif defined (__AVR_ATmega324P__)
+									#define	_AVR_CPU_NAME_	"ATmega324P"
+#elif defined (__AVR_ATmega325__)
+									#define	_AVR_CPU_NAME_	"ATmega325"
+#elif defined (__AVR_ATmega325P__)
+									#define	_AVR_CPU_NAME_	"ATmega325P"
+#elif defined (__AVR_ATmega3250__)
+									#define	_AVR_CPU_NAME_	"ATmega3250"
+#elif defined (__AVR_ATmega3250P__)
+									#define	_AVR_CPU_NAME_	"ATmega3250P"
+#elif defined (__AVR_ATmega328P__)
+									#define	_AVR_CPU_NAME_	"ATmega328P"
+#elif defined (__AVR_ATmega329__)
+									#define	_AVR_CPU_NAME_	"ATmega329"
+#elif defined (__AVR_ATmega329P__)
+									#define	_AVR_CPU_NAME_	"ATmega329P"
+#elif defined (__AVR_ATmega3290__)
+									#define	_AVR_CPU_NAME_	"ATmega3290"
+#elif defined (__AVR_ATmega3290P__)
+									#define	_AVR_CPU_NAME_	"ATmega3290P"
+#elif defined (__AVR_ATmega32HVB__)
+									#define	_AVR_CPU_NAME_	"ATmega32HVB"
+#elif defined (__AVR_ATmega406__)
+									#define	_AVR_CPU_NAME_	"ATmega406"
+#elif defined (__AVR_ATmega16__)
+									#define	_AVR_CPU_NAME_	"Atmega16"
+#elif defined (__AVR_ATmega161__)
+									#define	_AVR_CPU_NAME_	"ATmega161"
+#elif defined (__AVR_ATmega162__)
+									#define	_AVR_CPU_NAME_	"ATmega162"
+#elif defined (__AVR_ATmega163__)
+									#define	_AVR_CPU_NAME_	"ATmega163"
+#elif defined (__AVR_ATmega164P__)
+									#define	_AVR_CPU_NAME_	"ATmega164P"
+#elif defined (__AVR_ATmega165__)
+									#define	_AVR_CPU_NAME_	"ATmega165"
+#elif defined (__AVR_ATmega165P__)
+									#define	_AVR_CPU_NAME_	"ATmega165P"
+#elif defined (__AVR_ATmega168__)
+									#define	_AVR_CPU_NAME_	"ATmega168"
+#elif defined (__AVR_ATmega168P__)
+									#define	_AVR_CPU_NAME_	"ATmega168P"
+#elif defined (__AVR_ATmega169__)
+									#define	_AVR_CPU_NAME_	"Atmega169"
+#elif defined (__AVR_ATmega169P__)
+									#define	_AVR_CPU_NAME_	"ATmega169P"
+#elif defined (__AVR_ATmega8HVA__)
+									#define	_AVR_CPU_NAME_	"ATmega8HVA"
+#elif defined (__AVR_ATmega16HVA__)
+									#define	_AVR_CPU_NAME_	"ATmega16HVA"
+#elif defined (__AVR_ATmega8__)
+									#define	_AVR_CPU_NAME_	"ATmega8"
+#elif defined (__AVR_ATmega48__)
+									#define	_AVR_CPU_NAME_	"ATmega48"
+#elif defined (__AVR_ATmega48P__)
+									#define	_AVR_CPU_NAME_	"ATmega48P"
+#elif defined (__AVR_ATmega88__)
+									#define	_AVR_CPU_NAME_	"ATmega88"
+#elif defined (__AVR_ATmega88P__)
+									#define	_AVR_CPU_NAME_	"ATmega88P"
+#elif defined (__AVR_ATmega8515__)
+									#define	_AVR_CPU_NAME_	"ATmega8515"
+#elif defined (__AVR_ATmega8535__)
+									#define	_AVR_CPU_NAME_	"ATmega8535"
+#elif defined (__AVR_AT90S8535__)
+#elif defined (__AVR_AT90C8534__)
+#elif defined (__AVR_AT90S8515__)
+#elif defined (__AVR_AT90S4434__)
+#elif defined (__AVR_AT90S4433__)
+#elif defined (__AVR_AT90S4414__)
+#elif defined (__AVR_ATtiny22__)
+#elif defined (__AVR_ATtiny26__)
+#elif defined (__AVR_AT90S2343__)
+#elif defined (__AVR_AT90S2333__)
+#elif defined (__AVR_AT90S2323__)
+#elif defined (__AVR_AT90S2313__)
+#elif defined (__AVR_ATtiny2313__)
+									#define	_AVR_CPU_NAME_	"ATtiny2313"
+#elif defined (__AVR_ATtiny13__)
+#elif defined (__AVR_ATtiny13A__)
+#elif defined (__AVR_ATtiny25__)
+#elif defined (__AVR_ATtiny45__)
+#elif defined (__AVR_ATtiny85__)
+#elif defined (__AVR_ATtiny24__)
+#elif defined (__AVR_ATtiny44__)
+#elif defined (__AVR_ATtiny84__)
+#elif defined (__AVR_ATtiny261__)
+#elif defined (__AVR_ATtiny461__)
+#elif defined (__AVR_ATtiny861__)
+#elif defined (__AVR_ATtiny43U__)
+#elif defined (__AVR_ATtiny48__)
+#elif defined (__AVR_ATtiny88__)
+#elif defined (__AVR_ATtiny167__)
+#elif defined (__AVR_ATmega8U2__)
+									#define	_AVR_CPU_NAME_	"ATmega8U2"
+#else
+	#error cpu not defined
+#endif
+
+
+#if !defined (_AVR_CPU_NAME_)
+//	#define	_AVR_CPU_NAME_	"UNKNOWN"
+#endif