[avr-libc-commit] [2444] bug #42957 missing SPMCSR defines in iom328p.h

[Joerg Wunsch]

Revision: 2444
          http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2444
Author:   joerg_wunsch
Date:     2014-08-11 22:10:47 +0000 (Mon, 11 Aug 2014)
Log Message:
-----------
bug #42957 missing SPMCSR defines in iom328p.h
* include/iom328p.h: fix SPMCSR names; add correct signature for
ATmega328 device

Ticket Links:
------------
    http://savannah.gnu.org/bugs/?42957

Modified Paths:
--------------
    trunk/avr-libc/ChangeLog
    trunk/avr-libc/NEWS
    trunk/avr-libc/include/avr/iom328p.h

Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog    2014-08-11 21:50:59 UTC (rev 2443)
+++ trunk/avr-libc/ChangeLog    2014-08-11 22:10:47 UTC (rev 2444)
@@ -1,3 +1,9 @@
+2014-08-12  Joerg Wunsch <address@hidden>
+
+       bug #42957 missing SPMCSR defines in iom328p.h
+       * include/iom328p.h: fix SPMCSR names; add correct signature for
+       ATmega328 device
+
 2014-08-11  Joerg Wunsch <address@hidden>
 
        bug #38614 dtostrf - wrong behavior or wrong documentation

Modified: trunk/avr-libc/NEWS
===================================================================
--- trunk/avr-libc/NEWS 2014-08-11 21:50:59 UTC (rev 2443)
+++ trunk/avr-libc/NEWS 2014-08-11 22:10:47 UTC (rev 2444)
@@ -32,6 +32,7 @@
   [#42085] HFUSE_DEFAULT not defined for iotn84.h
   [#39779] PCIE0 and PCIE1 defined incorrectly for mega165a and mega165pa 
devices
   [#38614] dtostrf - wrong behavior or wrong documentation
+  [#42957] missing SPMCSR defines in iom328p.h
   [no-id]  XXX_vect_num not consistent io90pwmx.h, iousbxx6_7.h
   [no-id]  Specialize clock_prescale_set/get for mega hvb devices
   [no-id]  Update register and bit definitions for tiny 13a/24a/44a/84a,

Modified: trunk/avr-libc/include/avr/iom328p.h
===================================================================
--- trunk/avr-libc/include/avr/iom328p.h        2014-08-11 21:50:59 UTC (rev 
2443)
+++ trunk/avr-libc/include/avr/iom328p.h        2014-08-11 22:10:47 UTC (rev 
2444)
@@ -339,11 +339,14 @@
 #define BODS 6
 
 #define SPMCSR _SFR_IO8(0x37)
-#define SELFPRGEN 0
+#define SELFPRGEN 0 /* only for backwards compatibility with previous
+                    * avr-libc versions; not an official name */
+#define SPMEN 0
 #define PGERS 1
 #define PGWRT 2
 #define BLBSET 3
 #define RWWSRE 4
+#define SIGRD 5
 #define RWWSB 6
 #define SPMIE 7
 
@@ -920,7 +923,11 @@
 /* Signature */
 #define SIGNATURE_0 0x1E
 #define SIGNATURE_1 0x95
-#define SIGNATURE_2 0x0F
+#if defined(__AVR_ATmega328__)
+#  define SIGNATURE_2 0x14
+#else /* ATmega328P */
+#  define SIGNATURE_2 0x0F
+#endif
 
 
 #endif  /* _AVR_IOM328P_H_ */