]>
Commit | Line | Data |
---|---|---|
69ed15f0 JR |
1 | diff -Naurp configure.ac configure.ac |
2 | --- configure.ac 2013-03-15 11:55:29.000000000 +0530 | |
3 | +++ configure.ac 2013-03-15 11:56:20.000000000 +0530 | |
4 | @@ -679,6 +679,9 @@ AM_CONDITIONAL(HAS_at94k, test "x$HAS_at | |
5 | CHECK_AVR_DEVICE(ata5790) | |
6 | AM_CONDITIONAL(HAS_ata5790, test "x$HAS_ata5790" = "xyes") | |
7 | ||
8 | +CHECK_AVR_DEVICE(ata5790n) | |
9 | +AM_CONDITIONAL(HAS_ata5790n, test "x$HAS_ata5790n" = "xyes") | |
10 | + | |
11 | CHECK_AVR_DEVICE(ata5795) | |
12 | AM_CONDITIONAL(HAS_ata5795, test "x$HAS_ata5795" = "xyes") | |
13 | ||
14 | @@ -1337,6 +1340,7 @@ AC_CONFIG_FILES([ | |
15 | avr/lib/avr5/at90usb1287/Makefile | |
16 | avr/lib/avr5/at94k/Makefile | |
17 | avr/lib/avr5/ata5790/Makefile | |
18 | + avr/lib/avr5/ata5790n/Makefile | |
19 | avr/lib/avr5/ata5795/Makefile | |
20 | avr/lib/avr5/atmega16/Makefile | |
21 | avr/lib/avr5/atmega16a/Makefile | |
22 | diff -Naurp devtools/gen-avr-lib-tree.sh devtools/gen-avr-lib-tree.sh | |
23 | --- devtools/gen-avr-lib-tree.sh 2013-03-15 11:55:29.000000000 +0530 | |
24 | +++ devtools/gen-avr-lib-tree.sh 2013-03-15 11:56:20.000000000 +0530 | |
25 | @@ -175,6 +175,7 @@ at90usb1286:crtusb1286.o:${DEV_DEFS}:${C | |
26 | at90usb1287:crtusb1287.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
27 | at94k:crtat94k.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
28 | ata5790:crta5790.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
29 | +ata5790n:crta5790n.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
30 | ata5795:crta5795.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
31 | atmega16:crtm16.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
32 | atmega16a:crtm16a.o:${DEV_DEFS}:${CFLAGS_SPACE}:${DEV_ASFLAGS};\ | |
33 | diff -Naurp doc/api/main_page.dox doc/api/main_page.dox | |
34 | --- doc/api/main_page.dox 2013-03-15 11:55:29.000000000 +0530 | |
35 | +++ doc/api/main_page.dox 2013-03-15 11:56:20.000000000 +0530 | |
36 | @@ -210,6 +210,7 @@ compile-time. | |
37 | - ata5505 | |
38 | - ata5272 | |
39 | - ata5790 | |
40 | +- ata5790n | |
41 | - ata5795 | |
42 | ||
43 | \par CAN AVR Devices: | |
44 | diff -Naurp doc/api/using-tools.dox doc/api/using-tools.dox | |
45 | --- doc/api/using-tools.dox 2013-03-15 11:55:29.000000000 +0530 | |
46 | +++ doc/api/using-tools.dox 2013-03-15 11:56:20.000000000 +0530 | |
47 | @@ -307,6 +307,7 @@ AVR will be defined as well when using t | |
48 | <tr><td>avr5</td><td>at94k</td><td>__AVR_AT94K__</td></tr> | |
49 | <tr><td>avr5</td><td>atmega16</td><td>__AVR_ATmega16__</td></tr> | |
50 | <tr><td>avr5</td><td>ata5790</td><td>__AVR_ATA5790__</td></tr> | |
51 | + <tr><td>avr5</td><td>ata5790n</td><td>__AVR_ATA5790N__</td></tr> | |
52 | <tr><td>avr5</td><td>ata5795</td><td>__AVR_ATA5795__</td></tr> | |
53 | <tr><td>avr5</td><td>atmega161</td><td>__AVR_ATmega161__</td></tr> | |
54 | <tr><td>avr5</td><td>atmega162</td><td>__AVR_ATmega162__</td></tr> | |
55 | diff -Naurp include/avr/eeprom.h include/avr/eeprom.h | |
56 | --- include/avr/eeprom.h 2013-03-15 11:55:29.000000000 +0530 | |
57 | +++ include/avr/eeprom.h 2013-03-15 11:56:20.000000000 +0530 | |
58 | @@ -491,6 +491,8 @@ | |
59 | # define _EEPROM_SUFFIX _a6289 | |
60 | #elif defined (__AVR_ATA5790__) | |
61 | # define _EEPROM_SUFFIX _a5790 | |
62 | +#elif defined (__AVR_ATA5790N__) | |
63 | +# define _EEPROM_SUFFIX _a5790n | |
64 | #elif defined (__AVR_ATA5795__) | |
65 | # define _EEPROM_SUFFIX _a5795 | |
66 | /* avr1: the following only supported for assembler programs */ | |
67 | diff -Naurp include/avr/io.h include/avr/io.h | |
68 | --- include/avr/io.h 2013-03-15 11:55:29.000000000 +0530 | |
69 | +++ include/avr/io.h 2013-03-15 11:56:20.000000000 +0530 | |
70 | @@ -506,6 +506,8 @@ | |
71 | # include <avr/iox384d3.h> | |
72 | #elif defined (__AVR_ATA5790__) | |
73 | # include <avr/ioa5790.h> | |
74 | +#elif defined (__AVR_ATA5790N__) | |
75 | +# include <avr/ioa5790n.h> | |
76 | #elif defined (__AVR_ATA5272__) | |
77 | # include <avr/ioa5272.h> | |
78 | #elif defined (__AVR_ATA5505__) | |
79 | diff -Naurp include/avr/Makefile.am include/avr/Makefile.am | |
80 | --- include/avr/Makefile.am 2013-03-15 11:55:29.000000000 +0530 | |
81 | +++ include/avr/Makefile.am 2013-03-15 11:56:20.000000000 +0530 | |
82 | @@ -67,6 +67,7 @@ avr_HEADERS = \ | |
83 | ioa5505.h \ | |
84 | ioa5272.h \ | |
85 | ioa5790.h \ | |
86 | + ioa5790n.h \ | |
87 | ioa5795.h \ | |
88 | ioa6285.h \ | |
89 | ioa6286.h \ | |
90 | diff -Naurp include/avr/power.h include/avr/power.h | |
91 | --- include/avr/power.h 2013-03-15 11:55:29.000000000 +0530 | |
92 | +++ include/avr/power.h 2013-03-15 11:56:20.000000000 +0530 | |
93 | @@ -1649,6 +1649,7 @@ do{ \ | |
94 | ||
95 | ||
96 | #elif defined (__AVR_ATA5790__) \ | |
97 | +|| defined (__AVR_ATA5790N__) \ | |
98 | || defined (__AVR_ATA5795__) | |
99 | ||
100 | // Enable the voltage monitor | |
101 | @@ -1679,7 +1680,8 @@ do{ \ | |
102 | #define power_cinterface_enable() (PRR1 &= (uint8_t)~(1 << PRCI)) | |
103 | #define power_cinterface_disable() (PRR1 |= (uint8_t)(1 << PRCI)) | |
104 | ||
105 | -#if defined(__AVR_ATA5790__) | |
106 | +#if defined(__AVR_ATA5790__) \ | |
107 | +|| defined(__AVR_ATA5790N__) | |
108 | ||
109 | #define power_lfreceiver_enable() (PRR0 &= (uint8_t)~(1 << PRLFR)) | |
110 | #define power_lfreceiver_disable() (PRR0 |= (uint8_t)(1 << PRLFR)) | |
111 | @@ -2165,6 +2167,7 @@ void clock_prescale_set(clock_div_t __x) | |
112 | #define clock_prescale_get() (clock_div_t)(CLKPR & (uint8_t)((1<<CLKPS0)|(1<<CLKPS1))) | |
113 | ||
114 | #elif defined(__AVR_ATA5790__) \ | |
115 | +|| defined (__AVR_ATA5790N__) \ | |
116 | || defined (__AVR_ATA5795__) | |
117 | ||
118 | typedef enum | |
119 | diff -Naurp include/avr/sleep.h include/avr/sleep.h | |
120 | --- include/avr/sleep.h 2013-03-15 11:55:29.000000000 +0530 | |
121 | +++ include/avr/sleep.h 2013-03-15 11:56:20.000000000 +0530 | |
122 | @@ -568,6 +568,7 @@ | |
123 | } while(0) | |
124 | ||
125 | #elif defined (__AVR_ATA5790__) \ | |
126 | +|| defined (__AVR_ATA5790N__) \ | |
127 | || defined (__AVR_ATA5795__) | |
128 | ||
129 | #define SLEEP_MODE_IDLE (0) | |
130 | diff -Naurp include/avr/wdt.h include/avr/wdt.h | |
131 | --- include/avr/wdt.h 2013-03-15 11:55:29.000000000 +0530 | |
132 | +++ include/avr/wdt.h 2013-03-15 11:56:20.000000000 +0530 | |
133 | @@ -323,6 +323,7 @@ __asm__ __volatile__ ( \ | |
134 | || defined(__AVR_ATA5272__) \ | |
135 | || defined(__AVR_ATA5505__) \ | |
136 | || defined(__AVR_ATA5790__) \ | |
137 | +|| defined(__AVR_ATA5790N__) \ | |
138 | || defined(__AVR_ATA5795__) | |
139 | ||
140 | /* Use STS instruction. */ |