X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fpgm.h;h=cb81e54813634c9d8af8da6f5e363e0e68260be1;hb=02fde028c0bf13359b5b1fd993cb99a920ff5786;hp=20bb416e3aab2e202629bf562b3681a8d0db7549;hpb=cdf3e45aaa38fc701dceeb57e6ceedd6ca68f408;p=bertos.git

diff --git a/mware/pgm.h b/mware/pgm.h
index 20bb416e..cb81e548 100755
--- a/mware/pgm.h
+++ b/mware/pgm.h
@@ -22,7 +22,9 @@
 #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
 
@@ -135,8 +137,12 @@
 
 	#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
@@ -197,10 +203,12 @@ typedef PROGMEM uint32_t pgm_uint32_t;
 #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
 /* \} */