diff -Naurp configure.ac configure.ac --- configure.ac 2013-01-29 12:20:43.000000000 +0530 +++ configure.ac 2013-01-29 12:28:06.000000000 +0530 @@ -853,6 +853,9 @@ AM_CONDITIONAL(HAS_atmega32u6, test "x$H CHECK_AVR_DEVICE(atmega406) AM_CONDITIONAL(HAS_atmega406, test "x$HAS_atmega406" = "xyes") +CHECK_AVR_DEVICE(atmega64rfr2) +AM_CONDITIONAL(HAS_atmega64rfr2, test "x$HAS_atmega64rfr2" = "xyes") + CHECK_AVR_DEVICE(atmega64) AM_CONDITIONAL(HAS_atmega64, test "x$HAS_atmega64" = "xyes") @@ -957,6 +960,9 @@ AM_CONDITIONAL(HAS_at90usb1286, test "x$ CHECK_AVR_DEVICE(at90usb1287) AM_CONDITIONAL(HAS_at90usb1287, test "x$HAS_at90usb1287" = "xyes") +CHECK_AVR_DEVICE(atmega128rfr2) +AM_CONDITIONAL(HAS_atmega128rfr2, test "x$HAS_atmega128rfr2" = "xyes") + # avr6 CHECK_AVR_DEVICE(avr6) @@ -968,6 +974,9 @@ AM_CONDITIONAL(HAS_atmega2560, test "x$H CHECK_AVR_DEVICE(atmega2561) AM_CONDITIONAL(HAS_atmega2561, test "x$HAS_atmega2561" = "xyes") +CHECK_AVR_DEVICE(atmega256rfr2) +AM_CONDITIONAL(HAS_atmega256rfr2, test "x$HAS_atmega256rfr2" = "xyes") + # avrxmega2 CHECK_AVR_DEVICE(avrxmega2) @@ -1366,6 +1375,7 @@ AC_CONFIG_FILES([ avr/lib/avr5/atmega32u4/Makefile avr/lib/avr5/atmega32u6/Makefile avr/lib/avr5/atmega406/Makefile + avr/lib/avr5/atmega64rfr2/Makefile avr/lib/avr5/atmega64/Makefile avr/lib/avr5/atmega64a/Makefile avr/lib/avr5/atmega640/Makefile @@ -1406,6 +1416,7 @@ AC_CONFIG_FILES([ avr/lib/avr51/atmega1284/Makefile avr/lib/avr51/atmega1284p/Makefile avr/lib/avr51/atmega128rfa1/Makefile + avr/lib/avr51/atmega128rfr2/Makefile avr/lib/avr51/at90can128/Makefile avr/lib/avr51/at90usb1286/Makefile avr/lib/avr51/at90usb1287/Makefile @@ -1416,6 +1427,7 @@ AC_CONFIG_FILES([ avr/lib/avr6/Makefile avr/lib/avr6/atmega2560/Makefile avr/lib/avr6/atmega2561/Makefile + avr/lib/avr6/atmega256rfr2/Makefile ]) # avrxmega2 diff -Naurp devtools/gen-avr-lib-tree.sh devtools/gen-avr-lib-tree.sh --- devtools/gen-avr-lib-tree.sh 2013-01-29 12:20:43.000000000 +0530 +++ devtools/gen-avr-lib-tree.sh 2013-01-29 12:28:06.000000000 +0530 @@ -233,6 +233,7 @@ atmega32m1:crtm32m1.o:${DEV_DEFS}:${CFLA atmega32u4:crtm32u4.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ atmega32u6:crtm32u6.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ atmega406:crtm406.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ +atmega64rfr2:crtm64rfr2.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ atmega64:crtm64.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ atmega64a:crtm64a.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ atmega640:crtm640.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ @@ -271,6 +272,7 @@ atmega1281:crtm1281.o:${DEV_DEFS}:${CFLA atmega1284:crtm1284.o:${DEV_DEFS}:${CFLAGS_BIG_MEMORY}:${DEV_ASFLAGS};\ atmega1284p:crtm1284p.o:${DEV_DEFS}:${CFLAGS_BIG_MEMORY}:${DEV_ASFLAGS};\ atmega128rfa1:crtm128rfa1.o:${DEV_DEFS}:${CFLAGS_BIG_MEMORY}:${DEV_ASFLAGS};\ +atmega128rfr2:crtm128rfr2.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ at90can128:crtcan128.o:${DEV_DEFS}:${CFLAGS_BIG_MEMORY}:${DEV_ASFLAGS};\ at90usb1286:crtusb1286.o:${DEV_DEFS}:${CFLAGS_BIG_MEMORY}:${DEV_ASFLAGS};\ at90usb1287:crtusb1287.o:${DEV_DEFS}:${CFLAGS_BIG_MEMORY}:${DEV_ASFLAGS}\ @@ -278,7 +280,8 @@ at90usb1287:crtusb1287.o:${DEV_DEFS}:${C AVR6_DEV_INFO="\ atmega2560:crtm2560.o:${DEV_DEFS}:${CFLAGS_BIG_MEMORY}:${DEV_ASFLAGS};\ -atmega2561:crtm2561.o:${DEV_DEFS}:${CFLAGS_BIG_MEMORY}:${DEV_ASFLAGS}\ +atmega2561:crtm2561.o:${DEV_DEFS}:${CFLAGS_BIG_MEMORY}:${DEV_ASFLAGS};\ +atmega256rfr2:crtm256rfr2.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS}\ " AVRXMEGA2_DEV_INFO="\ diff -Naurp doc/api/main_page.dox doc/api/main_page.dox --- doc/api/main_page.dox 2013-01-29 12:20:43.000000000 +0530 +++ doc/api/main_page.dox 2013-01-29 12:28:06.000000000 +0530 @@ -321,6 +321,13 @@ compile-time. - atxmega384c3 - atxmega384d3 +\par Wireless AVR devices: + +-atmega64rfr2 +-atmega128rfa1 +-atmega128rfr2 +-atmega256rfr2 + \par Miscellaneous Devices: - at94K \ref supp_dev_footnote_two "[2]" diff -Naurp doc/api/using-tools.dox doc/api/using-tools.dox --- doc/api/using-tools.dox 2013-01-29 12:20:43.000000000 +0530 +++ doc/api/using-tools.dox 2013-01-29 12:28:06.000000000 +0530 @@ -364,6 +364,7 @@ AVR will be defined as well when using t avr5atmega32u4__AVR_ATmega32U4__ avr5atmega32u6__AVR_ATmega32U6__ avr5atmega406__AVR_ATmega406__ + avr5atmega64rfr2__AVR_ATmega64RFR2__ avr5atmega64__AVR_ATmega64__ avr5atmega64a__AVR_ATmega64A__ avr5atmega640__AVR_ATmega640__ @@ -397,9 +398,11 @@ AVR will be defined as well when using t avr5/avr51 [3]atmega1281__AVR_ATmega1281__ avr5/avr51 [3]atmega1284__AVR_ATmega1284__ avr5/avr51 [3]atmega1284p__AVR_ATmega1284P__ + avr5/avr51 [3]atmega128rfr2__AVR_ATmega128RFR2__ avr6atmega2560__AVR_ATmega2560__ avr6atmega2561__AVR_ATmega2561__ + avr6atmega256rfr2__AVR_ATmega256RFR2__ avrxmega2atxmega16a4__AVR_ATxmega16A4__ avrxmega2atxmega16a4u__AVR_ATxmega16A4U__ diff -Naurp include/avr/eeprom.h include/avr/eeprom.h --- include/avr/eeprom.h 2013-01-29 12:20:43.000000000 +0530 +++ include/avr/eeprom.h 2013-01-29 12:28:06.000000000 +0530 @@ -107,6 +107,10 @@ # define _EEPROM_SUFFIX _m1284p #elif defined (__AVR_ATmega128RFA1__) # define _EEPROM_SUFFIX _m128rfa1 +#elif defined (__AVR_ATmega128RFR2__) +# define _EEPROM_SUFFIX _m128rfr2 +#elif defined (__AVR_ATmega256RFR2__) +# define _EEPROM_SUFFIX _m256rfr2 #elif defined (__AVR_ATmega2560__) # define _EEPROM_SUFFIX _m2560 #elif defined (__AVR_ATmega2561__) @@ -129,6 +133,8 @@ # define _EEPROM_SUFFIX _usb1286 #elif defined (__AVR_AT90USB1287__) # define _EEPROM_SUFFIX _usb1287 +#elif defined (__AVR_ATmega64RFR2__) +# define _EEPROM_SUFFIX _m64rfr2 #elif defined (__AVR_ATmega64__) # define _EEPROM_SUFFIX _m64 #elif defined (__AVR_ATmega64A__) diff -Naurp include/avr/io.h include/avr/io.h --- include/avr/io.h 2013-01-29 12:20:43.000000000 +0530 +++ include/avr/io.h 2013-01-29 12:28:06.000000000 +0530 @@ -162,6 +162,10 @@ # include #elif defined (__AVR_ATmega128RFA1__) # include +#elif defined (__AVR_ATmega128RFR2__) +# include +#elif defined (__AVR_ATmega256RFR2__) +# include #elif defined (__AVR_ATmega2560__) # include #elif defined (__AVR_ATmega2561__) @@ -184,6 +188,8 @@ # include #elif defined (__AVR_AT90USB1287__) # include +#elif defined (__AVR_ATmega64RFR2__) +# include #elif defined (__AVR_ATmega64__) # include #elif defined (__AVR_ATmega64A__) diff -Naurp include/avr/Makefile.am include/avr/Makefile.am --- include/avr/Makefile.am 2013-01-29 12:20:43.000000000 +0530 +++ include/avr/Makefile.am 2013-01-29 12:28:06.000000000 +0530 @@ -84,6 +84,7 @@ avr_HEADERS = \ iom1284.h \ iom1284p.h \ iom128rfa1.h \ + iom128rfr2.h \ iom16.h \ iom16a.h \ iom161.h \ @@ -109,6 +110,7 @@ avr_HEADERS = \ iom16u4.h \ iom2560.h \ iom2561.h \ + iom256rfr2.h \ iom3000.h \ iom32.h \ iom32a.h \ @@ -148,6 +150,7 @@ avr_HEADERS = \ iom64c1.h \ iom64hve.h \ iom64m1.h \ + iom64rfr2.h \ iom8.h \ iom8a.h \ iom8515.h \ diff -Naurp include/avr/power.h include/avr/power.h --- include/avr/power.h 2013-01-29 12:20:43.000000000 +0530 +++ include/avr/power.h 2013-01-29 12:28:06.000000000 +0530 @@ -928,6 +928,74 @@ do{ \ PRR1 |= (uint8_t)((1<