X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fpgm.h;h=5f10d002ea5a6c153048467cd1746da88a79a20b;hb=83bdfc821b94188314a854356a67da2e89e5c8ab;hp=673b143dca7fca89db86ac27833b7cd4c448897d;hpb=eaef2bd654dd52b78d7147a9066ab3d49640ac13;p=bertos.git

diff --git a/mware/pgm.h b/mware/pgm.h
index 673b143d..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/)
@@ -150,6 +150,9 @@
 	#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
@@ -159,11 +162,15 @@
 #define PSTR            /* nothing */
 #endif
 
+#ifndef PFUNC
+#define PFUNC(x) x
+#endif
+
 #ifndef PROGMEM
 #define PROGMEM         /* nothing */
 #endif
 
-/*!
+/**
  * \name Types for variables stored in program memory (harvard processors).
  * \{
  */
@@ -176,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
@@ -209,13 +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_STR(x)	 PSTR(x)
+	#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_STR(x)       x
 	#define PGM_ATTR         /* nothing */
 #endif
 /* \} */