#ifndef MWARE_PGM_H
#define MWARE_PGM_H
-#include <cpu_detect.h>
+#include <cfg/cpu_detect.h>
+#include <cfg/compiler.h> /* For intXX_t */
+#include <cfg/cpu.h> /* For CPU_HARVARD */
#if CPU_AVR
#endif
+ #ifndef PROGMEM
#define PROGMEM __attribute__((__progmem__))
+ #endif
+ #ifndef PSTR
#define PSTR(s) ({ static const char __c[] PROGMEM = (s); &__c[0]; })
+ #endif
#elif CPU_HARVARD
#error Missing CPU support
/*\}*/
/*!
- * \def PGM_READ_CHAR
- * \def PGM_FUNC
- * \def PGM_ATTR
+ * \name PGM support macros.
*
* These macros enable dual compilation of code for both program
* and data memory.
* // To be used when invoking inside other PGM_FUNC functions:
* PGM_FUNC(lcd_puts)(some_string);
* \endcode
+ *
+ * \{
*/
#ifdef _PROGMEM
#define PGM_READ_CHAR(s) pgm_read_char(s)
#define PGM_FUNC(x) x ## _P
+ #define PGM_STR(x) PSTR(x)
#define PGM_ATTR PROGMEM
#else
#define PGM_READ_CHAR(s) (*(s))
#define PGM_FUNC(x) x
+ #define PGM_STR(x) x
#define PGM_ATTR /* nothing */
#endif
+/* \} */
#endif /* MWARE_PGM_H */