diff options
author | Georg-Johann Lay <avr@gjlay.de> | 2012-04-23 10:25:52 +0000 |
---|---|---|
committer | Georg-Johann Lay <gjl@gcc.gnu.org> | 2012-04-23 10:25:52 +0000 |
commit | 495f8a0d34967ce5d1e23e36b50d83c98bd36e33 (patch) | |
tree | 6b557fe4050f84d70bf092355eb72c91fb0d3871 /gcc/doc | |
parent | 0506b92953ebc863847213c15f253a837808f076 (diff) | |
download | gcc-495f8a0d34967ce5d1e23e36b50d83c98bd36e33.tar.gz |
extend.texi (AVR Named Address Spaces): Fix typos.
* doc/extend.texi (AVR Named Address Spaces): Fix typos.
From-SVN: r186699
Diffstat (limited to 'gcc/doc')
-rw-r--r-- | gcc/doc/extend.texi | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi index c770e35cb7f..b47805bccd3 100644 --- a/gcc/doc/extend.texi +++ b/gcc/doc/extend.texi @@ -1311,18 +1311,18 @@ support is available or not: #ifdef __FLASH const __flash int var = 1; -int read_i (void) +int read_var (void) @{ - return i; + return var; @} #else -#include <avr/pgmspace.h> /* From avr-libc */ +#include <avr/pgmspace.h> /* From AVR-LibC */ const int var PROGMEM = 1; -int read_i (void) +int read_var (void) @{ - return (int) pgm_read_word (&i); + return (int) pgm_read_word (&var); @} #endif /* __FLASH */ @end example @@ -1332,7 +1332,8 @@ locates data in flash but accesses to these data will read from generic address space, i.e.@: from RAM, so that you need special accessors like @code{pgm_read_byte} -from @w{@uref{http://nongnu.org/avr-libc/user-manual,avr-libc}}. +from @w{@uref{http://nongnu.org/avr-libc/user-manual,AVR-LibC}} +together with attribute @code{progmem}. @b{Limitations and caveats} @@ -1345,7 +1346,7 @@ supports reading across the 64@tie{}KiB flash segment boundaries is @code{__memx}. @item -If you use one if the @code{__flash@var{N}} address spaces +If you use one of the @code{__flash@var{N}} address spaces you will have to arrange your linker skript to locate the @code{.progmem@var{N}.data} sections according to your needs. @@ -4782,7 +4783,7 @@ of the data but not how this data is accessed. In order to read data located with the @code{progmem} attribute (inline) assembler must be used. @example -/* Use custom macros from @w{@uref{http://nongnu.org/avr-libc/user-manual,avr-libc}} */ +/* Use custom macros from @w{@uref{http://nongnu.org/avr-libc/user-manual,AVR-LibC}} */ #include <avr/pgmspace.h> /* Locate var in flash memory */ |