Changes to use register #ifdefs instead of cpu #ifdefs

Author: Mark Sproul

hardware/arduino/cores/arduino/HardwareSerial.cpp

@@ -28,6 +28,7 @@
 //*	Aug 31,	2010	<MLS> The ATmega32U4 has uart1 but NOT uart0
 //*	Sep  5,	2010	<MLS> V0019 was released, migrated changes into 0019
 //*	Sep 28,	2010	<MLS> V0020 was released, migrated changes into 0020
+//*	Oct  1,	2010	<MLS> Added more constraints to handle atmega128rfa1
 //*******************************************************************************************
 
 #include <stdlib.h>
@@ -170,7 +171,7 @@ SIGNAL(USART1_RX_vect)
 
 
 //#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
-#if defined(USART2_RX_vect)
+#if defined(USART2_RX_vect) && defined(UDR2)
 //*******************************************************************************************
 SIGNAL(USART2_RX_vect)
 {
@@ -181,7 +182,7 @@ SIGNAL(USART2_RX_vect)
 	#error SIG_USART2_RECV
 #endif
 
-#if defined(USART3_RX_vect)
+#if defined(USART3_RX_vect) && defined(UDR3)
 //*******************************************************************************************
 SIGNAL(USART3_RX_vect)
 {

hardware/arduino/cores/arduino/Print.cpp

@@ -18,6 +18,10 @@
  
  Modified 23 November 2006 by David A. Mellis
  */
+//************************************************************************
+//*	Sep 28,	2010	<MLS> V0020 was released, migrated changes into 0020
+//*	Oct  5,	2010	<MLS> V0020 was released, migrated changes into 0021
+//************************************************************************
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -218,3 +222,28 @@ void Print::printFloat(double number, uint8_t digits)
     remainder -= toPrint; 
   } 
 }
+
+
+//************************************************************************
+void Print::print_P(prog_char *flashMemStr)
+{
+char	theChar;
+int		ii;
+
+	ii		=	0;
+#if (FLASHEND > 0x10000)
+	while (theChar	=	pgm_read_byte_far(flashMemStr + ii++))
+#else
+	while (theChar	=	pgm_read_byte_near(flashMemStr + ii++))
+#endif
+	{
+		print(theChar);
+	}
+}
+
+//************************************************************************
+void Print::println_P(prog_char *flashMemStr)
+{
+	print_P(flashMemStr);
+	println();
+}

hardware/arduino/cores/arduino/Print.h

@@ -16,15 +16,25 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+//************************************************************************
+//*	Sep 28,	2010	<MLS> V0020 was released, migrated changes into 0020
+//*	Oct  5,	2010	<MLS> V0020 was released, migrated changes into 0021
+//************************************************************************
 
 #ifndef Print_h
 #define Print_h
 
 #include <inttypes.h>
 #include <stdio.h> // for size_t
 
+#include <avr/pgmspace.h>
+
+
 #include "WString.h"
 
+#undef BIN
+
+
 #define DEC 10
 #define HEX 16
 #define OCT 8
@@ -61,6 +71,10 @@ class Print
     void println(unsigned long, int = DEC);
     void println(double, int = 2);
     void println(void);
+    
+    
+    void print_P(prog_char *flashMemStr);
+    void println_P(prog_char *flashMemStr);
 };
 
 #endif