]>
Commit | Line | Data |
---|---|---|
9fe267c2 | 1 | diff -Naurp configure.ac configure.ac |
69ed15f0 JR |
2 | --- configure.ac 2013-01-29 12:35:00.000000000 +0530 |
3 | +++ configure.ac 2013-01-29 12:37:55.000000000 +0530 | |
9fe267c2 PZ |
4 | @@ -1005,7 +1005,15 @@ AM_CONDITIONAL(HAS_atxmega32c4, test "x$ |
5 | ||
6 | CHECK_AVR_DEVICE(atxmega32d4) | |
7 | AM_CONDITIONAL(HAS_atxmega32d4, test "x$HAS_atxmega32d4" = "xyes") | |
8 | + | |
9 | +CHECK_AVR_DEVICE(atxmega8e5) | |
10 | +AM_CONDITIONAL(HAS_atxmega8e5, test "x$HAS_atxmega8e5" = "xyes") | |
11 | ||
12 | +CHECK_AVR_DEVICE(atxmega16e5) | |
13 | +AM_CONDITIONAL(HAS_atxmega16e5, test "x$HAS_atxmega16e5" = "xyes") | |
14 | + | |
15 | +CHECK_AVR_DEVICE(atxmega32e5) | |
16 | +AM_CONDITIONAL(HAS_atxmega32e5, test "x$HAS_atxmega32e5" = "xyes") | |
17 | ||
18 | # avrxmega4 | |
19 | CHECK_AVR_DEVICE(avrxmega4) | |
20 | @@ -1441,6 +1449,9 @@ AC_CONFIG_FILES([ | |
21 | avr/lib/avrxmega2/atxmega32a4u/Makefile | |
22 | avr/lib/avrxmega2/atxmega32c4/Makefile | |
23 | avr/lib/avrxmega2/atxmega32d4/Makefile | |
24 | + avr/lib/avrxmega2/atxmega8e5/Makefile | |
25 | + avr/lib/avrxmega2/atxmega16e5/Makefile | |
26 | + avr/lib/avrxmega2/atxmega32e5/Makefile | |
27 | ]) | |
28 | ||
29 | # avrxmega4 | |
30 | diff -Naurp devtools/gen-avr-lib-tree.sh devtools/gen-avr-lib-tree.sh | |
69ed15f0 JR |
31 | --- devtools/gen-avr-lib-tree.sh 2013-01-29 12:35:00.000000000 +0530 |
32 | +++ devtools/gen-avr-lib-tree.sh 2013-01-29 12:37:55.000000000 +0530 | |
9fe267c2 PZ |
33 | @@ -292,7 +292,10 @@ atxmega16d4:crtx16d4.o:${DEV_DEFS}:${CFL |
34 | atxmega32a4:crtx32a4.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
35 | atxmega32a4u:crtx32a4u.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
36 | atxmega32c4:crtx32c4.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
37 | -atxmega32d4:crtx32d4.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS}\ | |
38 | +atxmega32d4:crtx32d4.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
39 | +atxmega8e5:crtx8e5.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
40 | +atxmega16e5:crtx16e5.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
41 | +atxmega32e5:crtx32e5.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS}\ | |
42 | " | |
43 | ||
44 | AVRXMEGA4_DEV_INFO="\ | |
45 | diff -Naurp doc/api/main_page.dox doc/api/main_page.dox | |
69ed15f0 JR |
46 | --- doc/api/main_page.dox 2013-01-29 12:35:00.000000000 +0530 |
47 | +++ doc/api/main_page.dox 2013-01-29 12:37:55.000000000 +0530 | |
9fe267c2 PZ |
48 | @@ -288,6 +288,9 @@ compile-time. |
49 | - atxmega32a4u | |
50 | - atxmega32c4 | |
51 | - atxmega32d4 | |
52 | +- atxmega8e5 | |
53 | +- atxmega16e5 | |
54 | +- atxmega32e5 | |
55 | - atxmega64a1 | |
56 | - atxmega64a1u | |
57 | - atxmega64a3 | |
58 | diff -Naurp doc/api/using-tools.dox doc/api/using-tools.dox | |
69ed15f0 JR |
59 | --- doc/api/using-tools.dox 2013-01-29 12:35:00.000000000 +0530 |
60 | +++ doc/api/using-tools.dox 2013-01-29 12:37:55.000000000 +0530 | |
9fe267c2 PZ |
61 | @@ -408,6 +408,9 @@ AVR will be defined as well when using t |
62 | <tr><td>avrxmega2</td><td>atxmega16a4u</td><td>__AVR_ATxmega16A4U__</td></tr> | |
63 | <tr><td>avrxmega2</td><td>atxmega16c4</td><td>__AVR_ATxmega16C4__</td></tr> | |
64 | <tr><td>avrxmega2</td><td>atxmega16d4</td><td>__AVR_ATxmega16D4__</td></tr> | |
65 | + <tr><td>avrxmega2</td><td>atxmega8e5</td><td>__AVR_ATxmega8E5__</td></tr> | |
66 | + <tr><td>avrxmega2</td><td>atxmega16e5</td><td>__AVR_ATxmega16E5__</td></tr> | |
67 | + <tr><td>avrxmega2</td><td>atxmega32e5</td><td>__AVR_ATxmega32E5__</td></tr> | |
68 | <tr><td>avrxmega2</td><td>atxmega32a4</td><td>__AVR_ATxmega32A4__</td></tr> | |
69 | <tr><td>avrxmega2</td><td>atxmega32a4u</td><td>__AVR_ATxmega32A4U__</td></tr> | |
70 | <tr><td>avrxmega2</td><td>atxmega32c4</td><td>__AVR_ATxmega32C4__</td></tr> | |
71 | diff -Naurp include/avr/eeprom.h include/avr/eeprom.h | |
69ed15f0 JR |
72 | --- include/avr/eeprom.h 2013-01-29 12:35:00.000000000 +0530 |
73 | +++ include/avr/eeprom.h 2013-01-29 12:37:55.000000000 +0530 | |
9fe267c2 PZ |
74 | @@ -401,6 +401,12 @@ |
75 | # define _EEPROM_SUFFIX _x32c4 | |
76 | #elif defined (__AVR_ATxmega32D4__) | |
77 | # define _EEPROM_SUFFIX _x32d4 | |
78 | +#elif defined (__AVR_ATxmega8E5__) | |
79 | +#define _EEPROM_SUFFIX _x8e5 | |
80 | +#elif defined (__AVR_ATxmega16E5__) | |
81 | +#define _EEPROM_SUFFIX _x16e5 | |
82 | +#elif defined (__AVR_ATxmega32E5__) | |
83 | +# define _EEPROM_SUFFIX _x32e5 | |
84 | #elif defined (__AVR_ATxmega64A1__) | |
85 | # define _EEPROM_SUFFIX _x64a1 | |
86 | #elif defined (__AVR_ATxmega64A1U__) | |
87 | diff -Naurp include/avr/io.h include/avr/io.h | |
69ed15f0 JR |
88 | --- include/avr/io.h 2013-01-29 12:35:00.000000000 +0530 |
89 | +++ include/avr/io.h 2013-01-29 12:37:55.000000000 +0530 | |
9fe267c2 PZ |
90 | @@ -426,6 +426,12 @@ |
91 | # include <avr/iox32c4.h> | |
92 | #elif defined (__AVR_ATxmega32D4__) | |
93 | # include <avr/iox32d4.h> | |
94 | +#elif defined (__AVR_ATxmega8E5__) | |
95 | +# include <avr/iox8e5.h> | |
96 | +#elif defined (__AVR_ATxmega16E5__) | |
97 | +# include <avr/iox16e5.h> | |
98 | +#elif defined (__AVR_ATxmega32E5__) | |
99 | +# include <avr/iox32e5.h> | |
100 | #elif defined (__AVR_ATxmega64A1__) | |
101 | # include <avr/iox64a1.h> | |
102 | #elif defined (__AVR_ATxmega64A1U__) | |
103 | diff -Naurp include/avr/Makefile.am include/avr/Makefile.am | |
69ed15f0 JR |
104 | --- include/avr/Makefile.am 2013-01-29 12:35:00.000000000 +0530 |
105 | +++ include/avr/Makefile.am 2013-01-29 12:37:55.000000000 +0530 | |
9fe267c2 PZ |
106 | @@ -246,6 +246,9 @@ avr_HEADERS = \ |
107 | iox32a4u.h \ | |
108 | iox32c4.h \ | |
109 | iox32d4.h \ | |
110 | + iox8e5.h \ | |
111 | + iox16e5.h \ | |
112 | + iox32e5.h \ | |
113 | iox64a1.h \ | |
114 | iox64a1u.h \ | |
115 | iox64a3.h \ | |
116 | diff -Naurp include/avr/power.h include/avr/power.h | |
69ed15f0 JR |
117 | --- include/avr/power.h 2013-01-29 12:35:00.000000000 +0530 |
118 | +++ include/avr/power.h 2013-01-29 12:37:55.000000000 +0530 | |
9fe267c2 PZ |
119 | @@ -751,6 +751,74 @@ do { \ |
120 | PR_PRPF |= (uint8_t)(PR_TWI_bm|PR_USART0_bm|PR_SPI_bm|PR_HIRES_bm|PR_TC1_bm|PR_TC0_bm); \ | |
121 | } while(0) | |
122 | ||
123 | + | |
124 | +#elif defined(__AVR_ATxmega32E5__) \ | |
125 | +|| defined(__AVR_ATxmega16E5__) \ | |
126 | +|| defined(__AVR_ATxmega8E5__) | |
127 | + | |
128 | +#define power_xcl_enable() (PR_PRGEN &= (uint8_t)~(PR_XCL_bm)) | |
129 | +#define power_xcl_disable() (PR_PRGEN |= (uint8_t)PR_XCL_bm) | |
130 | + | |
131 | +#define power_rtc_enable() (PR_PRGEN &= (uint8_t)~(PR_RTC_bm)) | |
132 | +#define power_rtc_disable() (PR_PRGEN |= (uint8_t)PR_RTC_bm) | |
133 | + | |
134 | +#define power_evsys_enable() (PR_PRGEN &= (uint8_t)~(PR_EVSYS_bm)) | |
135 | +#define power_evsys_disable() (PR_PRGEN |= (uint8_t)PR_EVSYS_bm) | |
136 | + | |
137 | +#define power_edma_enable() (PR_PRGEN &= (uint8_t)~(PR_EDMA_bm)) | |
138 | +#define power_edma_disable() (PR_PRGEN |= (uint8_t)PR_EDMA_bm) | |
139 | + | |
140 | +#define power_daca_enable() (PR_PRPA &= (uint8_t)~(PR_DAC_bm)) | |
141 | +#define power_daca_disable() (PR_PRPA |= (uint8_t)PR_DAC_bm) | |
142 | + | |
143 | +#define power_adca_enable() (PR_PRPA &= (uint8_t)~(PR_ADC_bm)) | |
144 | +#define power_adca_disable() (PR_PRPA |= (uint8_t)PR_ADC_bm) | |
145 | + | |
146 | +#define power_aca_enable() (PR_PRPA &= (uint8_t)~(PR_AC_bm)) | |
147 | +#define power_aca_disable() (PR_PRPA |= (uint8_t)PR_AC_bm) | |
148 | + | |
149 | +#define power_twic_enable() (PR_PRPC &= (uint8_t)~(PR_TWI_bm)) | |
150 | +#define power_twic_disable() (PR_PRPC |= (uint8_t)PR_TWI_bm) | |
151 | + | |
152 | +#define power_usartc0_enable() (PR_PRPC &= (uint8_t)~(PR_USART0_bm)) | |
153 | +#define power_usartc0_disable() (PR_PRPC |= (uint8_t)PR_USART0_bm) | |
154 | + | |
155 | +#define power_spic_enable() (PR_PRPC &= (uint8_t)~(PR_SPI_bm)) | |
156 | +#define power_spic_disable() (PR_PRPC |= (uint8_t)PR_SPI_bm) | |
157 | + | |
158 | +#define power_hiresc_enable() (PR_PRPC &= (uint8_t)~(PR_HIRES_bm)) | |
159 | +#define power_hiresc_disable() (PR_PRPC |= (uint8_t)PR_HIRES_bm) | |
160 | + | |
161 | +#define power_tc5c_enable() (PR_PRPC &= (uint8_t)~(PR_TC5_bm)) | |
162 | +#define power_tc5c_disable() (PR_PRPC |= (uint8_t)PR_TC5_bm) | |
163 | + | |
164 | +#define power_tc4c_enable() (PR_PRPC &= (uint8_t)~(PR_TC4_bm)) | |
165 | +#define power_tc4c_disable() (PR_PRPC |= (uint8_t)PR_TC4_bm) | |
166 | + | |
167 | +#define power_usartd0_enable() (PR_PRPD &= (uint8_t)~(PR_USART0_bm)) | |
168 | +#define power_usartd0_disable() (PR_PRPD |= (uint8_t)PR_USART0_bm) | |
169 | + | |
170 | +#define power_tc5d_enable() (PR_PRPC &= (uint8_t)~(PR_TC5_bm)) | |
171 | +#define power_tc5d_disable() (PR_PRPC |= (uint8_t)PR_TC5_bm) | |
172 | + | |
173 | +#define power_all_enable() \ | |
174 | +do { \ | |
175 | + PR_PRGEN &= (uint8_t)~(PR_RTC_bm|PR_EVSYS_bm|PR_XCL_bm|PR_EDMA_bm); \ | |
176 | + PR_PRPA &= (uint8_t)~(PR_ADC_bm|PR_AC_bm|PR_DAC_bm); \ | |
177 | + PR_PRPC &= (uint8_t)~(PR_TWI_bm|PR_USART0_bm|PR_SPI_bm|PR_HIRES_bm|PR_TC5_bm|PR_TC4_bm); \ | |
178 | + PR_PRPD &= (uint8_t)~(PR_USART0_bm|PR_TC5_bm); \ | |
179 | +} while(0) | |
180 | + | |
181 | + | |
182 | +#define power_all_disable() \ | |
183 | +do { \ | |
184 | + PR_PRGEN|= (uint8_t)(PR_XCL_bm|PR_RTC_bm|PR_EVSYS_bm|PR_EDMA_bm); \ | |
185 | + PR_PRPA |= (uint8_t)(PR_ADC_bm|PR_AC_bm|PR_DAC_bm); \ | |
186 | + PR_PRPC |= (uint8_t)(PR_TWI_bm|PR_USART0_bm|PR_SPI_bm|PR_HIRES_bm|PR_TC5_bm|PR_TC4_bm); \ | |
187 | + PR_PRPD |= (uint8_t)(PR_USART0_bm|PR_TC5_bm); \ | |
188 | +} while(0) | |
189 | + | |
190 | + | |
191 | #elif defined (__AVR_ATxmega64B1__) \ | |
192 | || defined (__AVR_ATxmega64B3__) \ | |
193 | || defined (__AVR_ATxmega128B1__) \ | |
194 | diff -Naurp include/avr/sleep.h include/avr/sleep.h | |
69ed15f0 JR |
195 | --- include/avr/sleep.h 2013-01-29 12:35:00.000000000 +0530 |
196 | +++ include/avr/sleep.h 2013-01-29 12:37:55.000000000 +0530 | |
197 | @@ -485,6 +485,9 @@ | |
9fe267c2 PZ |
198 | || defined(__AVR_ATxmega32A4U__) \ |
199 | || defined(__AVR_ATxmega32C4__) \ | |
200 | || defined(__AVR_ATxmega32D4__) \ | |
201 | +|| defined(__AVR_ATxmega8E5__) \ | |
202 | +|| defined(__AVR_ATxmega16E5__) \ | |
203 | +|| defined(__AVR_ATxmega32E5__) \ | |
204 | || defined(__AVR_ATxmega64A1__) \ | |
205 | || defined(__AVR_ATxmega64A1U__) \ | |
206 | || defined(__AVR_ATxmega64A3__) \ | |
207 | diff -Naurp include/avr/wdt.h include/avr/wdt.h | |
69ed15f0 JR |
208 | --- include/avr/wdt.h 2013-01-29 12:35:00.000000000 +0530 |
209 | +++ include/avr/wdt.h 2013-01-29 12:37:55.000000000 +0530 | |
9fe267c2 PZ |
210 | @@ -138,6 +138,9 @@ |
211 | || defined(__AVR_ATxmega32A4U__) \ | |
212 | || defined(__AVR_ATxmega32C4__) \ | |
213 | || defined(__AVR_ATxmega32D4__) \ | |
214 | +|| defined(__AVR_ATxmega8E5__) \ | |
215 | +|| defined(__AVR_ATxmega16E5__) \ | |
216 | +|| defined(__AVR_ATxmega32E5__) \ | |
217 | || defined(__AVR_ATxmega64A1U__) \ | |
218 | || defined(__AVR_ATxmega64A3__) \ | |
219 | || defined(__AVR_ATxmega64A3U__) \ |