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

diff --git a/mware/pgm.h b/mware/pgm.h
index 20bb416e..5f10d002 100755
--- a/mware/pgm.h
+++ b/mware/pgm.h
@@ -1,4 +1,4 @@
-/*!
+/**
  * \file
  * <!--
  * Copyright 2005 Develer S.r.l. (http://www.develer.com/)
@@ -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
 
@@ -74,7 +76,8 @@
 		})
 
 
-	#else
+	#else /* !__AVR_ENHANCED__ */
+
 		#define pgm_read_char(addr) \
 		({ \
 			uint16_t __addr16 = (uint16_t)(addr); \
@@ -133,10 +136,23 @@
 			__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
 	#define PROGMEM  __attribute__((__progmem__))
+	#endif
+	#ifndef PSTR
 	#define PSTR(s) ({ static const char __c[] PROGMEM = (s); &__c[0]; })
+	#endif
+	#ifndef PFUNC
+	#define PFUNC(x)      x ## _P
+	#endif
 
 #elif CPU_HARVARD
 	#error Missing CPU support
@@ -146,11 +162,15 @@
 #define PSTR            /* nothing */
 #endif
 
+#ifndef PFUNC
+#define PFUNC(x) x
+#endif
+
 #ifndef PROGMEM
-#define PROGMEM                /* nothing */
+#define PROGMEM         /* nothing */
 #endif
 
-/*!
+/**
  * \name Types for variables stored in program memory (harvard processors).
  * \{
  */
@@ -163,7 +183,7 @@ typedef PROGMEM int32_t pgm_int32_t;
 typedef PROGMEM uint32_t pgm_uint32_t;
 /*\}*/
 
-/*!
+/**
  * \name PGM support macros.
  *
  * These macros enable dual compilation of code for both program
@@ -196,11 +216,13 @@ 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_FUNC(x)      PFUNC(x)
+	#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
 /* \} */