Skip to content

Commit d245d95

Browse files
buserrorbuserror
committed
Partial merge of up to date avrlib headers
This is a complete mess. I have 4 copies, all of them with differences, unclear copyright dates and content. The most recent seems ... not to be the most recent for many files! So this is mostly a merge of what I had, what's on Debian, and what's on the Arduino base toolchain... Ewww Signed-off-by: Michel Pollet <[email protected]>
1 parent e3b2214 commit d245d95

File tree

280 files changed

+361897
-277351
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

280 files changed

+361897
-277351
lines changed

‎simavr/cores/avr/io.h

Lines changed: 151 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
3030
POSSIBILITY OF SUCH DAMAGE. */
3131

32-
/* $Id: io.h 2499 2016-01-28 14:41:31Z pitchumani $ */
32+
/* $Id$ */
3333

3434
/** \file */
3535
/** \defgroup avr_io <avr/io.h>: AVR device-specific IO definitions
@@ -210,14 +210,28 @@
210210
# include <avr/iom644p.h>
211211
#elif defined (__AVR_ATmega644PA__)
212212
# include <avr/iom644pa.h>
213-
#elif defined (__AVR_ATmega645__) || defined (__AVR_ATmega645A__) || defined (__AVR_ATmega645P__)
213+
#elif defined (__AVR_ATmega645__)
214214
# include <avr/iom645.h>
215-
#elif defined (__AVR_ATmega6450__) || defined (__AVR_ATmega6450A__) || defined (__AVR_ATmega6450P__)
215+
#elif (defined __AVR_ATmega645A__)
216+
#include <avr/iom645a.h>
217+
#elif (defined __AVR_ATmega645P__)
218+
#include <avr/iom645p.h>
219+
#elif defined (__AVR_ATmega6450__)
216220
# include <avr/iom6450.h>
217-
#elif defined (__AVR_ATmega649__) || defined (__AVR_ATmega649A__)
221+
#elif (defined __AVR_ATmega6450A__)
222+
#include <avr/iom6450a.h>
223+
#elif (defined __AVR_ATmega6450P__)
224+
#include <avr/iom6450p.h>
225+
#elif defined (__AVR_ATmega649__)
218226
# include <avr/iom649.h>
219-
#elif defined (__AVR_ATmega6490__) || defined (__AVR_ATmega6490A__) || defined (__AVR_ATmega6490P__)
227+
#elif (defined __AVR_ATmega649A__)
228+
#include <avr/iom649a.h>
229+
#elif defined (__AVR_ATmega6490__)
220230
# include <avr/iom6490.h>
231+
#elif (defined __AVR_ATmega6490A__)
232+
#include <avr/iom6490a.h>
233+
#elif (defined __AVR_ATmega6490P__)
234+
#include <avr/iom6490p.h>
221235
#elif defined (__AVR_ATmega649P__)
222236
# include <avr/iom649p.h>
223237
#elif defined (__AVR_ATmega64HVE__)
@@ -232,34 +246,48 @@
232246
# include <avr/iom32a.h>
233247
#elif defined (__AVR_ATmega323__)
234248
# include <avr/iom323.h>
235-
#elif defined (__AVR_ATmega324P__) || defined (__AVR_ATmega324A__)
236-
# include <avr/iom324.h>
249+
#elif defined (__AVR_ATmega324P__)
250+
# include <avr/iom324p.h>
251+
#elif (defined __AVR_ATmega324A__)
252+
#include <avr/iom324a.h>
237253
#elif defined (__AVR_ATmega324PA__)
238254
# include <avr/iom324pa.h>
239-
#elif defined (__AVR_ATmega325__) || defined (__AVR_ATmega325A__)
255+
#elif defined (__AVR_ATmega325__)
240256
# include <avr/iom325.h>
257+
#elif (defined __AVR_ATmega325A__)
258+
#include <avr/iom325a.h>
241259
#elif defined (__AVR_ATmega325P__)
242-
# include <avr/iom325.h>
260+
# include <avr/iom325p.h>
243261
#elif defined (__AVR_ATmega325PA__)
244262
# include <avr/iom325pa.h>
245-
#elif defined (__AVR_ATmega3250__) || defined (__AVR_ATmega3250A__)
263+
#elif defined (__AVR_ATmega3250__)
246264
# include <avr/iom3250.h>
265+
#elif (defined __AVR_ATmega3250A__)
266+
#include <avr/iom3250a.h>
247267
#elif defined (__AVR_ATmega3250P__)
248-
# include <avr/iom3250.h>
268+
# include <avr/iom3250p.h>
249269
#elif defined (__AVR_ATmega3250PA__)
250270
# include <avr/iom3250pa.h>
251-
#elif defined (__AVR_ATmega328P__) || defined (__AVR_ATmega328__)
271+
#elif defined (__AVR_ATmega328P__)
252272
# include <avr/iom328p.h>
253-
#elif defined (__AVR_ATmega329__) || defined (__AVR_ATmega329A__)
254-
# include <avr/iom329.h>
255-
#elif defined (__AVR_ATmega329P__) || defined (__AVR_ATmega329PA__)
273+
#elif (defined __AVR_ATmega328__)
274+
#include <avr/iom328.h>
275+
#elif defined (__AVR_ATmega329__)
256276
# include <avr/iom329.h>
257-
#elif defined (__AVR_ATmega3290__) || defined (__AVR_ATmega3290A__)
277+
#elif (defined __AVR_ATmega329A__)
278+
#include <avr/iom329a.h>
279+
#elif defined (__AVR_ATmega329P__)
280+
# include <avr/iom329p.h>
281+
#elif (defined __AVR_ATmega329PA__)
282+
#include <avr/iom329pa.h>
283+
#elif (defined __AVR_ATmega3290PA__)
284+
#include <avr/iom3290pa.h>
285+
#elif defined (__AVR_ATmega3290__)
258286
# include <avr/iom3290.h>
287+
#elif (defined __AVR_ATmega3290A__)
288+
#include <avr/iom3290a.h>
259289
#elif defined (__AVR_ATmega3290P__)
260290
# include <avr/iom3290.h>
261-
#elif defined (__AVR_ATmega3290PA__)
262-
# include <avr/iom3290pa.h>
263291
#elif defined (__AVR_ATmega32HVB__)
264292
# include <avr/iom32hvb.h>
265293
#elif defined (__AVR_ATmega32HVBREVB__)
@@ -276,8 +304,10 @@
276304
# include <avr/iom162.h>
277305
#elif defined (__AVR_ATmega163__)
278306
# include <avr/iom163.h>
279-
#elif defined (__AVR_ATmega164P__) || defined (__AVR_ATmega164A__)
280-
# include <avr/iom164.h>
307+
#elif defined (__AVR_ATmega164P__)
308+
# include <avr/iom164p.h>
309+
#elif (defined __AVR_ATmega164A__)
310+
#include <avr/iom164a.h>
281311
#elif defined (__AVR_ATmega164PA__)
282312
# include <avr/iom164pa.h>
283313
#elif defined (__AVR_ATmega165__)
@@ -296,8 +326,12 @@
296326
# include <avr/iom168p.h>
297327
#elif defined (__AVR_ATmega168PA__)
298328
# include <avr/iom168pa.h>
299-
#elif defined (__AVR_ATmega169__) || defined (__AVR_ATmega169A__)
329+
#elif defined (__AVR_ATmega168PB__)
330+
# include <avr/iom168pb.h>
331+
#elif defined (__AVR_ATmega169__)
300332
# include <avr/iom169.h>
333+
#elif (defined __AVR_ATmega169A__)
334+
#include <avr/iom169a.h>
301335
#elif defined (__AVR_ATmega169P__)
302336
# include <avr/iom169p.h>
303337
#elif defined (__AVR_ATmega169PA__)
@@ -446,6 +480,8 @@
446480
# include <avr/iox16c4.h>
447481
#elif defined (__AVR_ATxmega16D4__)
448482
# include <avr/iox16d4.h>
483+
#elif defined (__AVR_ATxmega16E5__)
484+
# include <avr/iox16e5.h>
449485
#elif defined (__AVR_ATxmega32A4__)
450486
# include <avr/iox32a4.h>
451487
#elif defined (__AVR_ATxmega32A4U__)
@@ -532,6 +568,8 @@
532568
# include <avr/ioa5790.h>
533569
#elif defined (__AVR_ATA5790N__)
534570
# include <avr/ioa5790n.h>
571+
#elif defined (__AVR_ATA5791__)
572+
# include <avr/ioa5791.h>
535573
#elif defined (__AVR_ATA5831__)
536574
# include <avr/ioa5831.h>
537575
#elif defined (__AVR_ATA5272__)
@@ -558,6 +596,10 @@
558596
# include <avr/ioa6617c.h>
559597
#elif defined (__AVR_ATA664251__)
560598
# include <avr/ioa664251.h>
599+
#elif defined (__AVR_ATA8210__)
600+
# include <avr/ioa8210.h>
601+
#elif defined (__AVR_ATA8510__)
602+
# include <avr/ioa8510.h>
561603
/* avr1: the following only supported for assembler programs */
562604
#elif defined (__AVR_ATtiny28__)
563605
# include <avr/iotn28.h>
@@ -571,6 +613,94 @@
571613
# include <avr/iotn11.h>
572614
#elif defined (__AVR_M3000__)
573615
# include <avr/iom3000.h>
616+
#elif defined (__AVR_AVR128DA64__)
617+
# include <avr/ioavr128da64.h>
618+
#elif defined (__AVR_AVR128DA48__)
619+
# include <avr/ioavr128da48.h>
620+
#elif defined (__AVR_AVR128DA32__)
621+
# include <avr/ioavr128da32.h>
622+
#elif defined (__AVR_AVR128DA28__)
623+
# include <avr/ioavr128da28.h>
624+
#elif defined (__AVR_ATtiny817__)
625+
# include <avr/iotn817.h>
626+
#elif defined (__AVR_ATtiny816__)
627+
# include <avr/iotn816.h>
628+
#elif defined (__AVR_ATtiny814__)
629+
# include <avr/iotn814.h>
630+
#elif defined (__AVR_ATtiny807__)
631+
# include <avr/iotn807.h>
632+
#elif defined (__AVR_ATtiny806__)
633+
# include <avr/iotn806.h>
634+
#elif defined (__AVR_ATtiny804__)
635+
# include <avr/iotn804.h>
636+
#elif defined (__AVR_ATtiny417__)
637+
# include <avr/iotn417.h>
638+
#elif defined (__AVR_ATtiny416__)
639+
# include <avr/iotn416.h>
640+
#elif defined (__AVR_ATtiny414__)
641+
# include <avr/iotn414.h>
642+
#elif defined (__AVR_ATtiny412__)
643+
# include <avr/iotn412.h>
644+
#elif defined (__AVR_ATtiny406__)
645+
# include <avr/iotn406.h>
646+
#elif defined (__AVR_ATtiny404__)
647+
# include <avr/iotn404.h>
648+
#elif defined (__AVR_ATtiny402__)
649+
# include <avr/iotn402.h>
650+
#elif defined (__AVR_ATtiny3217__)
651+
# include <avr/iotn3217.h>
652+
#elif defined (__AVR_ATtiny3216__)
653+
# include <avr/iotn3216.h>
654+
#elif defined (__AVR_ATtiny214__)
655+
# include <avr/iotn214.h>
656+
#elif defined (__AVR_ATtiny212__)
657+
# include <avr/iotn212.h>
658+
#elif defined (__AVR_ATtiny204__)
659+
# include <avr/iotn204.h>
660+
#elif defined (__AVR_ATtiny202__)
661+
# include <avr/iotn202.h>
662+
#elif defined (__AVR_ATtiny1627__)
663+
# include <avr/iotn1627.h>
664+
#elif defined (__AVR_ATtiny1626__)
665+
# include <avr/iotn1626.h>
666+
#elif defined (__AVR_ATtiny1624__)
667+
# include <avr/iotn1624.h>
668+
#elif defined (__AVR_ATtiny1617__)
669+
# include <avr/iotn1617.h>
670+
#elif defined (__AVR_ATtiny1616__)
671+
# include <avr/iotn1616.h>
672+
#elif defined (__AVR_ATtiny1614__)
673+
# include <avr/iotn1614.h>
674+
#elif defined (__AVR_ATtiny1607__)
675+
# include <avr/iotn1607.h>
676+
#elif defined (__AVR_ATtiny1606__)
677+
# include <avr/iotn1606.h>
678+
#elif defined (__AVR_ATtiny1604__)
679+
# include <avr/iotn1604.h>
680+
#elif defined (__AVR_ATtiny104__)
681+
# include <avr/iotn104.h>
682+
#elif defined (__AVR_ATtiny102__)
683+
# include <avr/iotn102.h>
684+
#elif defined (__AVR_ATmega809__)
685+
# include <avr/iom809.h>
686+
#elif defined (__AVR_ATmega808__)
687+
# include <avr/iom808.h>
688+
#elif defined (__AVR_ATmega4809__)
689+
# include <avr/iom4809.h>
690+
#elif defined (__AVR_ATmega4808__)
691+
# include <avr/iom4808.h>
692+
#elif defined (__AVR_ATmega328PB__)
693+
# include <avr/iom328pb.h>
694+
#elif defined (__AVR_ATmega324PB__)
695+
# include <avr/iom324pb.h>
696+
#elif defined (__AVR_ATmega3209__)
697+
# include <avr/iom3209.h>
698+
#elif defined (__AVR_ATmega3208__)
699+
# include <avr/iom3208.h>
700+
#elif defined (__AVR_ATmega1609__)
701+
# include <avr/iom1609.h>
702+
#elif defined (__AVR_ATmega1608__)
703+
# include <avr/iom1608.h>
574704
#elif defined (__AVR_DEV_LIB_NAME__)
575705
# define __concat__(a,b) a##b
576706
# define __header1__(a,b) __concat__(a,b)

‎simavr/cores/avr/io1200.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2929
POSSIBILITY OF SUCH DAMAGE. */
3030

31-
/* $Id: io1200.h 2434 2014-08-05 06:57:11Z pitchumani $ */
31+
/* $Id: io1200.h 2225 2011-03-02 16:27:26Z arcanum $ */
3232

3333
/* avr/io1200.h - definitions for AT90S1200 */
3434

‎simavr/cores/avr/io2313.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2929
POSSIBILITY OF SUCH DAMAGE. */
3030

31-
/* $Id: io2313.h 2456 2014-11-19 09:57:29Z saaadhu $ */
31+
/* $Id: io2313.h 2225 2011-03-02 16:27:26Z arcanum $ */
3232

3333
/* avr/io2313.h - definitions for AT90S2313 */
3434

@@ -378,7 +378,6 @@
378378
#define SIGNATURE_1 0x91
379379
#define SIGNATURE_2 0x01
380380

381-
382381
#define SLEEP_MODE_IDLE 0
383382
#define SLEEP_MODE_PWR_DOWN _BV(SM)
384383

‎simavr/cores/avr/io2323.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2929
POSSIBILITY OF SUCH DAMAGE. */
3030

31-
/* $Id: io2323.h 2483 2015-08-06 09:16:30Z pitchumani $ */
31+
/* $Id: io2323.h 2225 2011-03-02 16:27:26Z arcanum $ */
3232

3333
/* avr/io2323.h - definitions for AT90S2323 */
3434

‎simavr/cores/avr/io2333.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2929
POSSIBILITY OF SUCH DAMAGE. */
3030

31-
/* $Id: io2333.h 2456 2014-11-19 09:57:29Z saaadhu $ */
31+
/* $Id: io2333.h 2225 2011-03-02 16:27:26Z arcanum $ */
3232

3333
/* avr/io2333.h - definitions for AT90S2333 */
3434

@@ -458,5 +458,4 @@
458458
#define SLEEP_MODE_IDLE 0
459459
#define SLEEP_MODE_PWR_DOWN _BV(SM)
460460

461-
462461
#endif /* _AVR_IO2333_H_ */

‎simavr/cores/avr/io2343.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2929
POSSIBILITY OF SUCH DAMAGE. */
3030

31-
/* $Id: io2343.h 2456 2014-11-19 09:57:29Z saaadhu $ */
31+
/* $Id: io2343.h 2225 2011-03-02 16:27:26Z arcanum $ */
3232

3333
/* avr/io2343.h - definitions for AT90S2343 */
3434

@@ -208,9 +208,7 @@
208208
#define SIGNATURE_1 0x91
209209
#define SIGNATURE_2 0x03
210210

211-
212211
#define SLEEP_MODE_IDLE 0
213212
#define SLEEP_MODE_PWR_DOWN _BV(SM)
214213

215-
216214
#endif /* _AVR_IO2343_H_ */

‎simavr/cores/avr/io43u32x.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2929
POSSIBILITY OF SUCH DAMAGE. */
3030

31-
/* $Id: io43u32x.h 2456 2014-11-19 09:57:29Z saaadhu $ */
31+
/* $Id: io43u32x.h 1873 2009-02-11 17:53:39Z arcanum $ */
3232

3333
/* avr/io43u32x.h - definitions for AT43USB32x */
3434

@@ -437,5 +437,4 @@
437437
#define SLEEP_MODE_IDLE 0
438438
#define SLEEP_MODE_PWR_DOWN _BV(SM)
439439

440-
441440
#endif /* _AVR_43USB32X_H_ */

‎simavr/cores/avr/io43u35x.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2929
POSSIBILITY OF SUCH DAMAGE. */
3030

31-
/* $Id: io43u35x.h 2456 2014-11-19 09:57:29Z saaadhu $ */
31+
/* $Id: io43u35x.h 1873 2009-02-11 17:53:39Z arcanum $ */
3232

3333
/* avr/io43u35x.h - definitions for AT43USB35x */
3434

@@ -429,5 +429,4 @@
429429
#define SLEEP_MODE_IDLE 0
430430
#define SLEEP_MODE_PWR_DOWN _BV(SM)
431431

432-
433432
#endif /* _AVR_43USB355_H_ */

‎simavr/cores/avr/io4414.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2929
POSSIBILITY OF SUCH DAMAGE. */
3030

31-
/* $Id: io4414.h 2456 2014-11-19 09:57:29Z saaadhu $ */
31+
/* $Id: io4414.h 2225 2011-03-02 16:27:26Z arcanum $ */
3232

3333
/* avr/io4414.h - definitions for AT90S4414 */
3434

@@ -494,9 +494,7 @@
494494
#define SIGNATURE_1 0x92
495495
#define SIGNATURE_2 0x01
496496

497-
498497
#define SLEEP_MODE_IDLE 0
499498
#define SLEEP_MODE_PWR_DOWN _BV(SM)
500499

501-
502500
#endif /* _AVR_IO4414_H_ */

‎simavr/cores/avr/io4433.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2929
POSSIBILITY OF SUCH DAMAGE. */
3030

31-
/* $Id: io4433.h 2456 2014-11-19 09:57:29Z saaadhu $ */
31+
/* $Id: io4433.h 2225 2011-03-02 16:27:26Z arcanum $ */
3232

3333
/* avr/io4433.h - definitions for AT90S4433 */
3434

@@ -483,9 +483,7 @@
483483
#define SIGNATURE_1 0x92
484484
#define SIGNATURE_2 0x03
485485

486-
487486
#define SLEEP_MODE_IDLE 0
488487
#define SLEEP_MODE_PWR_DOWN _BV(SM)
489488

490-
491489
#endif /* _AVR_IO4433_H_ */

0 commit comments

Comments
 (0)