X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fpgm.h;h=673b143dca7fca89db86ac27833b7cd4c448897d;hb=16e8698d6693cce1eb0f7bb174f9acb1f1c00a78;hp=ea28043e98587cdf166bffec5c81844cecff752c;hpb=72f7d07b915bc6a874ec820de585c6d017c81a94;p=bertos.git

diff --git a/mware/pgm.h b/mware/pgm.h
index ea28043e..673b143d 100755
--- a/mware/pgm.h
+++ b/mware/pgm.h
@@ -24,6 +24,7 @@
 
 #include <cfg/cpu_detect.h>
 #include <cfg/compiler.h> /* For intXX_t */
+#include <cfg/cpu.h> /* For CPU_HARVARD */
 
 #if CPU_AVR
 
@@ -75,7 +76,8 @@
 		})
 
 
-	#else
+	#else /* !__AVR_ENHANCED__ */
+
 		#define pgm_read_char(addr) \
 		({ \
 			uint16_t __addr16 = (uint16_t)(addr); \
@@ -134,6 +136,12 @@
 			__result; \
 		})
 
+	#endif /* !__AVR_ENHANCED__ */
+
+	#if SIZEOF_INT == 2
+		#define pgm_read_int(addr) ((int)pgm_read_uint16_t(addr))
+	#else
+		#error Missing support for CPU word size != 16bit
 	#endif
 
 	#ifndef PROGMEM
@@ -152,7 +160,7 @@
 #endif
 
 #ifndef PROGMEM
-#define PROGMEM                /* nothing */
+#define PROGMEM         /* nothing */
 #endif
 
 /*!