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

diff --git a/mware/pgm.h b/mware/pgm.h
old mode 100755
new mode 100644
index 673b143d..f0dc05a4
--- a/mware/pgm.h
+++ b/mware/pgm.h
@@ -1,4 +1,4 @@
-/*!
+/**
  * \file
  * <!--
  * Copyright 2005 Develer S.r.l. (http://www.develer.com/)
@@ -41,26 +41,6 @@
 			); \
 			__result; \
 		})
-		#if 0 // 128/103
-		#define pgm_read_uint16_t(addr) \
-		({ \
-			uint32_t __addr32 = (uint32_t)(addr); \
-			uint16_t __result; \
-			__asm__ \
-			( \
-				"out %2, %C1"   "\n\t" \
-				"movw r30, %1"  "\n\t" \
-				"elpm %A0, Z+"  "\n\t" \
-				"elpm %B0, Z"   "\n\t" \
-				: "=r" (__result) \
-				: "r" (__addr32), \
-				  "I" (_SFR_IO_ADDR(RAMPZ)) \
-				: "r30", "r31" \
-			); \
-			__result; \
-		})
-		#endif
-
 		#define pgm_read_uint16_t(addr) \
 		({ \
 			uint16_t __addr16 = (uint16_t)(addr); \
@@ -92,32 +72,6 @@
 			); \
 			__result; \
 		})
-		#if 0 // 128/103
-		#define pgm_read_uint16_t(addr) \
-		({ \
-			uint32_t __addr32 = (uint32_t)(addr); \
-			uint16_t __result; \
-			__asm__ \
-			( \
-				"out %2, %C1"   "\n\t" \
-				"mov r31, %B1"  "\n\t" \
-				"mov r30, %A1"  "\n\t" \
-				"elpm"          "\n\t" \
-				"mov %A0, r0"   "\n\t" \
-				"in r0, %2"     "\n\t" \
-				"adiw r30, 1"   "\n\t" \
-				"adc r0, __zero_reg__" "\n\t" \
-				"out %2, r0"    "\n\t" \
-				"elpm"          "\n\t" \
-				"mov %B0, r0"   "\n\t" \
-				: "=r" (__result) \
-				: "r" (__addr32), \
-				  "I" (_SFR_IO_ADDR(RAMPZ)) \
-				: "r0", "r30", "r31" \
-			); \
-			__result; \
-		})
-		#endif
 		#define pgm_read_uint16_t(addr) \
 		({ \
 			uint16_t __addr16 = (uint16_t)(addr); \
@@ -150,6 +104,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 +116,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 +137,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 +170,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
 /* \} */