diff options
author | tmk <nobody@nowhere> | 2014-11-24 13:50:33 +0900 |
---|---|---|
committer | tmk <nobody@nowhere> | 2014-11-24 13:50:33 +0900 |
commit | 363950982a291c3bfa03ac6362061b1d37dc06b0 (patch) | |
tree | c46fc53fe00137ced3c8edd3d0766ee844f77516 /common/progmem.h | |
parent | eb90ed6238426db9367e294abfaefb5de07564f5 (diff) | |
parent | 60096e11c77980ca6b54674c5b68248e8aa15d8d (diff) | |
download | firmware-363950982a291c3bfa03ac6362061b1d37dc06b0.tar.gz firmware-363950982a291c3bfa03ac6362061b1d37dc06b0.tar.bz2 firmware-363950982a291c3bfa03ac6362061b1d37dc06b0.zip |
Merge branch 'rn42' into merge_rn42
Conflicts:
.gitignore
common.mk
common/debug_config.h
common/print.h
Diffstat (limited to 'common/progmem.h')
-rw-r--r-- | common/progmem.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/common/progmem.h b/common/progmem.h new file mode 100644 index 000000000..199b1bedf --- /dev/null +++ b/common/progmem.h @@ -0,0 +1,12 @@ +#ifndef PROGMEM_H +#define PROGMEM_H 1 + +#if defined(__AVR__) +# include <avr/pgmspace.h> +#elif defined(__arm__) +# define PROGMEM +# define pgm_read_byte(p) *(p) +# define pgm_read_word(p) *(p) +#endif + +#endif |