[avr-libc-commit] [2256] 2011-09-26 Eric B.

[Eric Weddington]

Revision: 2256
          http://svn.sv.gnu.org/viewvc/?view=rev&root=avr-libc&revision=2256
Author:   arcanum
Date:     2011-09-26 15:39:20 +0000 (Mon, 26 Sep 2011)
Log Message:
-----------
2011-09-26  Eric B. Weddington <address@hidden>

        Partial fix for bug #33716.
        * include/avr/pgmspace.h: Deprecate typedefs with __progmem__ attribute.
        Document as such.

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

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

Modified: trunk/avr-libc/ChangeLog
===================================================================
--- trunk/avr-libc/ChangeLog    2011-09-26 15:09:05 UTC (rev 2255)
+++ trunk/avr-libc/ChangeLog    2011-09-26 15:39:20 UTC (rev 2256)
@@ -1,5 +1,11 @@
 2011-09-26  Eric B. Weddington <address@hidden>
 
+       Partial fix for bug #33716.
+       * include/avr/pgmspace.h: Deprecate typedefs with __progmem__ attribute.
+       Document as such.
+
+2011-09-26  Eric B. Weddington <address@hidden>
+
        Fix for bug #33858.
        * include/avr/power.h: Add condition for _AVR_ATmega328_.
        * NEWS: Add to fixed bug list.

Modified: trunk/avr-libc/include/avr/pgmspace.h
===================================================================
--- trunk/avr-libc/include/avr/pgmspace.h       2011-09-26 15:09:05 UTC (rev 
2255)
+++ trunk/avr-libc/include/avr/pgmspace.h       2011-09-26 15:39:20 UTC (rev 
2256)
@@ -118,19 +118,33 @@
  * GCC, and confuses the typedefs with function decls, so
  * supply a doxygen-friendly view.
  */
+
 /**
    \ingroup avr_pgmspace
    \typedef prog_void
+   \note DEPRECATED
 
+   This typedef is now deprecated because the usage of the __progmem__ 
+   attribute on a type is not supported in GCC. However, the use of the 
+   __progmem__ attribute on a variable declaration is supported, and this is 
+   now the recommended usage.
+
    Type of a "void" object located in flash ROM.  Does not make much
    sense by itself, but can be used to declare a "void *" object in
    flash ROM.
 */
 typedef void PROGMEM prog_void;
+
 /**
    \ingroup avr_pgmspace
    \typedef prog_char
+   \note DEPRECATED
 
+   This typedef is now deprecated because the usage of the __progmem__ 
+   attribute on a type is not supported in GCC. However, the use of the 
+   __progmem__ attribute on a variable declaration is supported, and this is 
+   now the recommended usage.
+
    Type of a "char" object located in flash ROM.
 */
 typedef char PROGMEM prog_char;
@@ -138,16 +152,27 @@
 /**
    \ingroup avr_pgmspace
    \typedef prog_uchar
+   \note DEPRECATED
 
+   This typedef is now deprecated because the usage of the __progmem__ 
+   attribute on a type is not supported in GCC. However, the use of the 
+   __progmem__ attribute on a variable declaration is supported, and this is 
+   now the recommended usage.
+
    Type of an "unsigned char" object located in flash ROM.
 */
 typedef unsigned char PROGMEM prog_uchar;
 
-
 /**
    \ingroup avr_pgmspace
    \typedef prog_int8_t
+   \note DEPRECATED
 
+   This typedef is now deprecated because the usage of the __progmem__ 
+   attribute on a type is not supported in GCC. However, the use of the 
+   __progmem__ attribute on a variable declaration is supported, and this is 
+   now the recommended usage.
+
    Type of an "int8_t" object located in flash ROM.
 */
 typedef int8_t PROGMEM prog_int8_t;
@@ -155,7 +180,13 @@
 /**
    \ingroup avr_pgmspace
    \typedef prog_uint8_t
+   \note DEPRECATED
 
+   This typedef is now deprecated because the usage of the __progmem__ 
+   attribute on a type is not supported in GCC. However, the use of the 
+   __progmem__ attribute on a variable declaration is supported, and this is 
+   now the recommended usage.
+
    Type of an "uint8_t" object located in flash ROM.
 */
 typedef uint8_t PROGMEM prog_uint8_t;
@@ -163,7 +194,13 @@
 /**
    \ingroup avr_pgmspace
    \typedef prog_int16_t
+   \note DEPRECATED
 
+   This typedef is now deprecated because the usage of the __progmem__ 
+   attribute on a type is not supported in GCC. However, the use of the 
+   __progmem__ attribute on a variable declaration is supported, and this is 
+   now the recommended usage.
+
    Type of an "int16_t" object located in flash ROM.
 */
 typedef int16_t PROGMEM prog_int16_t;
@@ -171,7 +208,13 @@
 /**
    \ingroup avr_pgmspace
    \typedef prog_uint16_t
+   \note DEPRECATED
 
+   This typedef is now deprecated because the usage of the __progmem__ 
+   attribute on a type is not supported in GCC. However, the use of the 
+   __progmem__ attribute on a variable declaration is supported, and this is 
+   now the recommended usage.
+
    Type of an "uint16_t" object located in flash ROM.
 */
 typedef uint16_t PROGMEM prog_uint16_t;
@@ -179,7 +222,13 @@
 /**
    \ingroup avr_pgmspace
    \typedef prog_int32_t
+   \note DEPRECATED
 
+   This typedef is now deprecated because the usage of the __progmem__ 
+   attribute on a type is not supported in GCC. However, the use of the 
+   __progmem__ attribute on a variable declaration is supported, and this is 
+   now the recommended usage.
+
    Type of an "int32_t" object located in flash ROM.
 */
 typedef int32_t PROGMEM prog_int32_t;
@@ -187,7 +236,13 @@
 /**
    \ingroup avr_pgmspace
    \typedef prog_uint32_t
+   \note DEPRECATED
 
+   This typedef is now deprecated because the usage of the __progmem__ 
+   attribute on a type is not supported in GCC. However, the use of the 
+   __progmem__ attribute on a variable declaration is supported, and this is 
+   now the recommended usage.
+
    Type of an "uint32_t" object located in flash ROM.
 */
 typedef uint32_t PROGMEM prog_uint32_t;
@@ -195,7 +250,13 @@
 /**
    \ingroup avr_pgmspace
    \typedef prog_int64_t
+   \note DEPRECATED
 
+   This typedef is now deprecated because the usage of the __progmem__ 
+   attribute on a type is not supported in GCC. However, the use of the 
+   __progmem__ attribute on a variable declaration is supported, and this is 
+   now the recommended usage.
+
    Type of an "int64_t" object located in flash ROM.
 
    \note This type is not available when the compiler
@@ -206,7 +267,13 @@
 /**
    \ingroup avr_pgmspace
    \typedef prog_uint64_t
+   \note DEPRECATED
 
+   This typedef is now deprecated because the usage of the __progmem__ 
+   attribute on a type is not supported in GCC. However, the use of the 
+   __progmem__ attribute on a variable declaration is supported, and this is 
+   now the recommended usage.
+
    Type of an "uint64_t" object located in flash ROM.
 
    \note This type is not available when the compiler
@@ -214,19 +281,18 @@
 */
 typedef uint64_t PROGMEM prog_uint64_t;
 #else  /* !DOXYGEN */
-typedef void prog_void PROGMEM;
-typedef char prog_char PROGMEM;
-typedef unsigned char prog_uchar PROGMEM;
-
-typedef int8_t    prog_int8_t   PROGMEM;
-typedef uint8_t   prog_uint8_t  PROGMEM;
-typedef int16_t   prog_int16_t  PROGMEM;
-typedef uint16_t  prog_uint16_t PROGMEM;
-typedef int32_t   prog_int32_t  PROGMEM;
-typedef uint32_t  prog_uint32_t PROGMEM;
+typedef void prog_void __attribute__((__progmem__,deprecated("prog_void type 
is deprecated.")));
+typedef char prog_char __attribute__((__progmem__,deprecated("prog_char type 
is deprecated.")));
+typedef unsigned char prog_uchar 
__attribute__((__progmem__,deprecated("prog_uchar type is deprecated.")));
+typedef int8_t    prog_int8_t   
__attribute__((__progmem__,deprecated("prog_int8_t type is deprecated.")));
+typedef uint8_t   prog_uint8_t  
__attribute__((__progmem__,deprecated("prog_uint8_t type is deprecated.")));
+typedef int16_t   prog_int16_t  
__attribute__((__progmem__,deprecated("prog_int16_t type is deprecated.")));
+typedef uint16_t  prog_uint16_t 
__attribute__((__progmem__,deprecated("prog_uint16_t type is deprecated.")));
+typedef int32_t   prog_int32_t  
__attribute__((__progmem__,deprecated("prog_int32_t type is deprecated.")));
+typedef uint32_t  prog_uint32_t 
__attribute__((__progmem__,deprecated("prog_uint32_t type is deprecated.")));
 #if !__USING_MINT8
-typedef int64_t   prog_int64_t  PROGMEM;
-typedef uint64_t  prog_uint64_t PROGMEM;
+typedef int64_t   prog_int64_t  
__attribute__((__progmem__,deprecated("prog_int64_t type is deprecated.")));
+typedef uint64_t  prog_uint64_t 
__attribute__((__progmem__,deprecated("prog_uint64_t type is deprecated.")));
 #endif
 #endif /* defined(__DOXYGEN__) */