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]>
buserror · Sep 22, 2023 · d245d95 · d245d95
1 parent e3b2214
commit d245d95
Show file tree

Hide file tree

Showing 280 changed files with 361,897 additions and 277,351 deletions.
diff --git a/simavr/cores/avr/io.h b/simavr/cores/avr/io.h
@@ -29,7 +29,7 @@
   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
   POSSIBILITY OF SUCH DAMAGE. */
 
-/* $Id: io.h 2499 2016-01-28 14:41:31Z pitchumani $ */
+/* $Id$ */
 
 /** \file */
 /** \defgroup avr_io <avr/io.h>: AVR device-specific IO definitions
@@ -210,14 +210,28 @@
 #  include <avr/iom644p.h>
 #elif defined (__AVR_ATmega644PA__)
 #  include <avr/iom644pa.h>
-#elif defined (__AVR_ATmega645__) || defined (__AVR_ATmega645A__) || defined (__AVR_ATmega645P__)
+#elif defined (__AVR_ATmega645__)
 #  include <avr/iom645.h>
-#elif defined (__AVR_ATmega6450__) || defined (__AVR_ATmega6450A__) || defined (__AVR_ATmega6450P__)
+#elif (defined __AVR_ATmega645A__)
+#include <avr/iom645a.h>
+#elif (defined __AVR_ATmega645P__)
+#include <avr/iom645p.h>
+#elif defined (__AVR_ATmega6450__)
 #  include <avr/iom6450.h>
-#elif defined (__AVR_ATmega649__) || defined (__AVR_ATmega649A__)
+#elif (defined __AVR_ATmega6450A__)
+#include <avr/iom6450a.h>
+#elif (defined __AVR_ATmega6450P__)
+#include <avr/iom6450p.h>
+#elif defined (__AVR_ATmega649__)
 #  include <avr/iom649.h>
-#elif defined (__AVR_ATmega6490__) || defined (__AVR_ATmega6490A__) || defined (__AVR_ATmega6490P__)
+#elif (defined __AVR_ATmega649A__)
+#include <avr/iom649a.h>
+#elif defined (__AVR_ATmega6490__)
 #  include <avr/iom6490.h>
+#elif (defined __AVR_ATmega6490A__)
+#include <avr/iom6490a.h>
+#elif (defined __AVR_ATmega6490P__)
+#include <avr/iom6490p.h>
 #elif defined (__AVR_ATmega649P__)
 #  include <avr/iom649p.h>
 #elif defined (__AVR_ATmega64HVE__)
@@ -232,34 +246,48 @@
 #  include <avr/iom32a.h>
 #elif defined (__AVR_ATmega323__)
 #  include <avr/iom323.h>
-#elif defined (__AVR_ATmega324P__) || defined (__AVR_ATmega324A__)
-#  include <avr/iom324.h>
+#elif defined (__AVR_ATmega324P__)
+#  include <avr/iom324p.h>
+#elif (defined __AVR_ATmega324A__)
+#include <avr/iom324a.h>
 #elif defined (__AVR_ATmega324PA__)
 #  include <avr/iom324pa.h>
-#elif defined (__AVR_ATmega325__) || defined (__AVR_ATmega325A__)
+#elif defined (__AVR_ATmega325__)
 #  include <avr/iom325.h>
+#elif (defined __AVR_ATmega325A__)
+#include <avr/iom325a.h>
 #elif defined (__AVR_ATmega325P__)
-#  include <avr/iom325.h>
+#  include <avr/iom325p.h>
 #elif defined (__AVR_ATmega325PA__)
 #  include <avr/iom325pa.h>  
-#elif defined (__AVR_ATmega3250__) || defined (__AVR_ATmega3250A__)
+#elif defined (__AVR_ATmega3250__) 
 #  include <avr/iom3250.h>
+#elif (defined __AVR_ATmega3250A__)
+#include <avr/iom3250a.h>
 #elif defined (__AVR_ATmega3250P__)
-#  include <avr/iom3250.h>
+#  include <avr/iom3250p.h>
 #elif defined (__AVR_ATmega3250PA__)
 #  include <avr/iom3250pa.h>  
-#elif defined (__AVR_ATmega328P__) || defined (__AVR_ATmega328__)
+#elif defined (__AVR_ATmega328P__)
 #  include <avr/iom328p.h>
-#elif defined (__AVR_ATmega329__) || defined (__AVR_ATmega329A__)
-#  include <avr/iom329.h>
-#elif defined (__AVR_ATmega329P__) || defined (__AVR_ATmega329PA__)
+#elif (defined __AVR_ATmega328__)
+#include <avr/iom328.h>
+#elif defined (__AVR_ATmega329__)
 #  include <avr/iom329.h>
-#elif defined (__AVR_ATmega3290__) || defined (__AVR_ATmega3290A__)
+#elif (defined __AVR_ATmega329A__)
+#include <avr/iom329a.h>
+#elif defined (__AVR_ATmega329P__) 
+#  include <avr/iom329p.h>
+#elif (defined __AVR_ATmega329PA__)
+#include <avr/iom329pa.h>
+#elif (defined __AVR_ATmega3290PA__)
+#include <avr/iom3290pa.h>
+#elif defined (__AVR_ATmega3290__)
 #  include <avr/iom3290.h>
+#elif (defined __AVR_ATmega3290A__)
+#include <avr/iom3290a.h>
 #elif defined (__AVR_ATmega3290P__)
 #  include <avr/iom3290.h>
-#elif defined (__AVR_ATmega3290PA__)
-#  include <avr/iom3290pa.h> 
 #elif defined (__AVR_ATmega32HVB__)
 #  include <avr/iom32hvb.h>
 #elif defined (__AVR_ATmega32HVBREVB__)
@@ -276,8 +304,10 @@
 #  include <avr/iom162.h>
 #elif defined (__AVR_ATmega163__)
 #  include <avr/iom163.h>
-#elif defined (__AVR_ATmega164P__) || defined (__AVR_ATmega164A__)
-#  include <avr/iom164.h>
+#elif defined (__AVR_ATmega164P__)
+#  include <avr/iom164p.h>
+#elif (defined __AVR_ATmega164A__)
+#include <avr/iom164a.h>
 #elif defined (__AVR_ATmega164PA__)
 #  include <avr/iom164pa.h>
 #elif defined (__AVR_ATmega165__)
@@ -296,8 +326,12 @@
 #  include <avr/iom168p.h>
 #elif defined (__AVR_ATmega168PA__)
 #  include <avr/iom168pa.h>
-#elif defined (__AVR_ATmega169__) || defined (__AVR_ATmega169A__)
+#elif defined (__AVR_ATmega168PB__)
+#  include <avr/iom168pb.h>
+#elif defined (__AVR_ATmega169__)
 #  include <avr/iom169.h>
+#elif (defined __AVR_ATmega169A__)
+#include <avr/iom169a.h>
 #elif defined (__AVR_ATmega169P__)
 #  include <avr/iom169p.h>
 #elif defined (__AVR_ATmega169PA__)
@@ -446,6 +480,8 @@
 #  include <avr/iox16c4.h>
 #elif defined (__AVR_ATxmega16D4__)
 #  include <avr/iox16d4.h>
+#elif defined (__AVR_ATxmega16E5__)
+#  include <avr/iox16e5.h>
 #elif defined (__AVR_ATxmega32A4__)
 #  include <avr/iox32a4.h>
 #elif defined (__AVR_ATxmega32A4U__)
@@ -532,6 +568,8 @@
 #  include <avr/ioa5790.h>
 #elif defined (__AVR_ATA5790N__)
 #  include <avr/ioa5790n.h>
+#elif defined (__AVR_ATA5791__)
+#  include <avr/ioa5791.h>
 #elif defined (__AVR_ATA5831__)
 #  include <avr/ioa5831.h>
 #elif defined (__AVR_ATA5272__)
@@ -558,6 +596,10 @@
 #  include <avr/ioa6617c.h>
 #elif defined (__AVR_ATA664251__)
 #  include <avr/ioa664251.h>
+#elif defined (__AVR_ATA8210__)
+#  include <avr/ioa8210.h>
+#elif defined (__AVR_ATA8510__)
+#  include <avr/ioa8510.h>
 /* avr1: the following only supported for assembler programs */
 #elif defined (__AVR_ATtiny28__)
 #  include <avr/iotn28.h>
@@ -571,6 +613,94 @@
 #  include <avr/iotn11.h>
 #elif defined (__AVR_M3000__)
 #  include <avr/iom3000.h>
+#elif defined (__AVR_AVR128DA64__)
+#  include <avr/ioavr128da64.h>
+#elif defined (__AVR_AVR128DA48__)
+#  include <avr/ioavr128da48.h>
+#elif defined (__AVR_AVR128DA32__)
+#  include <avr/ioavr128da32.h>
+#elif defined (__AVR_AVR128DA28__)
+#  include <avr/ioavr128da28.h>
+#elif defined (__AVR_ATtiny817__)
+#  include <avr/iotn817.h>
+#elif defined (__AVR_ATtiny816__)
+#  include <avr/iotn816.h>
+#elif defined (__AVR_ATtiny814__)
+#  include <avr/iotn814.h>
+#elif defined (__AVR_ATtiny807__)
+#  include <avr/iotn807.h>
+#elif defined (__AVR_ATtiny806__)
+#  include <avr/iotn806.h>
+#elif defined (__AVR_ATtiny804__)
+#  include <avr/iotn804.h>
+#elif defined (__AVR_ATtiny417__)
+#  include <avr/iotn417.h>
+#elif defined (__AVR_ATtiny416__)
+#  include <avr/iotn416.h>
+#elif defined (__AVR_ATtiny414__)
+#  include <avr/iotn414.h>
+#elif defined (__AVR_ATtiny412__)
+#  include <avr/iotn412.h>
+#elif defined (__AVR_ATtiny406__)
+#  include <avr/iotn406.h>
+#elif defined (__AVR_ATtiny404__)
+#  include <avr/iotn404.h>
+#elif defined (__AVR_ATtiny402__)
+#  include <avr/iotn402.h>
+#elif defined (__AVR_ATtiny3217__)
+#  include <avr/iotn3217.h>
+#elif defined (__AVR_ATtiny3216__)
+#  include <avr/iotn3216.h>
+#elif defined (__AVR_ATtiny214__)
+#  include <avr/iotn214.h>
+#elif defined (__AVR_ATtiny212__)
+#  include <avr/iotn212.h>
+#elif defined (__AVR_ATtiny204__)
+#  include <avr/iotn204.h>
+#elif defined (__AVR_ATtiny202__)
+#  include <avr/iotn202.h>
+#elif defined (__AVR_ATtiny1627__)
+#  include <avr/iotn1627.h>
+#elif defined (__AVR_ATtiny1626__)
+#  include <avr/iotn1626.h>
+#elif defined (__AVR_ATtiny1624__)
+#  include <avr/iotn1624.h>
+#elif defined (__AVR_ATtiny1617__)
+#  include <avr/iotn1617.h>
+#elif defined (__AVR_ATtiny1616__)
+#  include <avr/iotn1616.h>
+#elif defined (__AVR_ATtiny1614__)
+#  include <avr/iotn1614.h>
+#elif defined (__AVR_ATtiny1607__)
+#  include <avr/iotn1607.h>
+#elif defined (__AVR_ATtiny1606__)
+#  include <avr/iotn1606.h>
+#elif defined (__AVR_ATtiny1604__)
+#  include <avr/iotn1604.h>
+#elif defined (__AVR_ATtiny104__)
+#  include <avr/iotn104.h>
+#elif defined (__AVR_ATtiny102__)
+#  include <avr/iotn102.h>
+#elif defined (__AVR_ATmega809__)
+#  include <avr/iom809.h>
+#elif defined (__AVR_ATmega808__)
+#  include <avr/iom808.h>
+#elif defined (__AVR_ATmega4809__)
+#  include <avr/iom4809.h>
+#elif defined (__AVR_ATmega4808__)
+#  include <avr/iom4808.h>
+#elif defined (__AVR_ATmega328PB__)
+#  include <avr/iom328pb.h>
+#elif defined (__AVR_ATmega324PB__)
+#  include <avr/iom324pb.h>
+#elif defined (__AVR_ATmega3209__)
+#  include <avr/iom3209.h>
+#elif defined (__AVR_ATmega3208__)
+#  include <avr/iom3208.h>
+#elif defined (__AVR_ATmega1609__)
+#  include <avr/iom1609.h>
+#elif defined (__AVR_ATmega1608__)
+#  include <avr/iom1608.h>
 #elif defined (__AVR_DEV_LIB_NAME__)
 #  define __concat__(a,b) a##b
 #  define __header1__(a,b) __concat__(a,b)

diff --git a/simavr/cores/avr/io1200.h b/simavr/cores/avr/io1200.h
@@ -28,7 +28,7 @@
   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
   POSSIBILITY OF SUCH DAMAGE. */
 
-/* $Id: io1200.h 2434 2014-08-05 06:57:11Z pitchumani $ */
+/* $Id: io1200.h 2225 2011-03-02 16:27:26Z arcanum $ */
 
 /* avr/io1200.h - definitions for AT90S1200 */
 

diff --git a/simavr/cores/avr/io2313.h b/simavr/cores/avr/io2313.h
@@ -28,7 +28,7 @@
   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
   POSSIBILITY OF SUCH DAMAGE. */
 
-/* $Id: io2313.h 2456 2014-11-19 09:57:29Z saaadhu $ */
+/* $Id: io2313.h 2225 2011-03-02 16:27:26Z arcanum $ */
 
 /* avr/io2313.h - definitions for AT90S2313 */
 
@@ -378,7 +378,6 @@
 #define SIGNATURE_1 0x91
 #define SIGNATURE_2 0x01
 
-
 #define SLEEP_MODE_IDLE         0
 #define SLEEP_MODE_PWR_DOWN     _BV(SM)
 

diff --git a/simavr/cores/avr/io2323.h b/simavr/cores/avr/io2323.h
@@ -28,7 +28,7 @@
   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
   POSSIBILITY OF SUCH DAMAGE. */
 
-/* $Id: io2323.h 2483 2015-08-06 09:16:30Z pitchumani $ */
+/* $Id: io2323.h 2225 2011-03-02 16:27:26Z arcanum $ */
 
 /* avr/io2323.h - definitions for AT90S2323 */
 

diff --git a/simavr/cores/avr/io2333.h b/simavr/cores/avr/io2333.h
@@ -28,7 +28,7 @@
   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
   POSSIBILITY OF SUCH DAMAGE. */
 
-/* $Id: io2333.h 2456 2014-11-19 09:57:29Z saaadhu $ */
+/* $Id: io2333.h 2225 2011-03-02 16:27:26Z arcanum $ */
 
 /* avr/io2333.h - definitions for AT90S2333 */
 
@@ -458,5 +458,4 @@
 #define SLEEP_MODE_IDLE         0
 #define SLEEP_MODE_PWR_DOWN     _BV(SM)
 
-
 #endif /* _AVR_IO2333_H_ */
diff --git a/simavr/cores/avr/io2343.h b/simavr/cores/avr/io2343.h
@@ -28,7 +28,7 @@
   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
   POSSIBILITY OF SUCH DAMAGE. */
 
-/* $Id: io2343.h 2456 2014-11-19 09:57:29Z saaadhu $ */
+/* $Id: io2343.h 2225 2011-03-02 16:27:26Z arcanum $ */
 
 /* avr/io2343.h - definitions for AT90S2343 */
 
@@ -208,9 +208,7 @@
 #define SIGNATURE_1 0x91
 #define SIGNATURE_2 0x03
 
-
 #define SLEEP_MODE_IDLE         0
 #define SLEEP_MODE_PWR_DOWN     _BV(SM)
 
-
 #endif /* _AVR_IO2343_H_ */
diff --git a/simavr/cores/avr/io43u32x.h b/simavr/cores/avr/io43u32x.h
@@ -28,7 +28,7 @@
   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
   POSSIBILITY OF SUCH DAMAGE. */
 
-/* $Id: io43u32x.h 2456 2014-11-19 09:57:29Z saaadhu $ */
+/* $Id: io43u32x.h 1873 2009-02-11 17:53:39Z arcanum $ */
 
 /* avr/io43u32x.h - definitions for AT43USB32x */
 
@@ -437,5 +437,4 @@
 #define SLEEP_MODE_IDLE         0
 #define SLEEP_MODE_PWR_DOWN     _BV(SM)
 
-
 #endif /* _AVR_43USB32X_H_ */
diff --git a/simavr/cores/avr/io43u35x.h b/simavr/cores/avr/io43u35x.h
@@ -28,7 +28,7 @@
   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
   POSSIBILITY OF SUCH DAMAGE. */
 
-/* $Id: io43u35x.h 2456 2014-11-19 09:57:29Z saaadhu $ */
+/* $Id: io43u35x.h 1873 2009-02-11 17:53:39Z arcanum $ */
 
 /* avr/io43u35x.h - definitions for AT43USB35x */
 
@@ -429,5 +429,4 @@
 #define SLEEP_MODE_IDLE         0
 #define SLEEP_MODE_PWR_DOWN     _BV(SM)
 
-
 #endif /* _AVR_43USB355_H_ */
diff --git a/simavr/cores/avr/io4414.h b/simavr/cores/avr/io4414.h
@@ -28,7 +28,7 @@
   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
   POSSIBILITY OF SUCH DAMAGE. */
 
-/* $Id: io4414.h 2456 2014-11-19 09:57:29Z saaadhu $ */
+/* $Id: io4414.h 2225 2011-03-02 16:27:26Z arcanum $ */
 
 /* avr/io4414.h - definitions for AT90S4414 */
 
@@ -494,9 +494,7 @@
 #define SIGNATURE_1 0x92
 #define SIGNATURE_2 0x01
 
-
 #define SLEEP_MODE_IDLE         0
 #define SLEEP_MODE_PWR_DOWN     _BV(SM)
 
-
 #endif /* _AVR_IO4414_H_ */
diff --git a/simavr/cores/avr/io4433.h b/simavr/cores/avr/io4433.h
@@ -28,7 +28,7 @@
   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
   POSSIBILITY OF SUCH DAMAGE. */
 
-/* $Id: io4433.h 2456 2014-11-19 09:57:29Z saaadhu $ */
+/* $Id: io4433.h 2225 2011-03-02 16:27:26Z arcanum $ */
 
 /* avr/io4433.h - definitions for AT90S4433 */
 
@@ -483,9 +483,7 @@
 #define SIGNATURE_1 0x92
 #define SIGNATURE_2 0x03
 
-
 #define SLEEP_MODE_IDLE         0
 #define SLEEP_MODE_PWR_DOWN     _BV(SM)
 
-
 #endif /* _AVR_IO4433_H_ */