include cleanup

[z180-stamp.git] / include / common.h

diff --git a/include/common.h b/include/common.h
index a92f62c129c616390a9b898dabd41bd38fc7fdd9..74339df76dd0ce24d336ea5a50c434705ee41e2e 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -3,6 +3,7 @@
 
 #ifdef __AVR__
 #include <avr/io.h>
+#include <avr/pgmspace.h>
 
 //TODO:
 //  Known to work: 4.8.4, 4.9.1
@@ -17,8 +18,10 @@
 
 #ifdef __FLASH
 #define FLASH __flash
+#define MEMX __memx
 #else
 #define FLASH
+#define MEMX
 #endif 
 
 #define stringify(s)   tostring(s)
@@ -35,7 +38,8 @@ extern volatile uint_least8_t Stat;
 #endif /* __AVR__ */
 
 #define S_10MS_TO      (1<<0)
-#define S_Z180_RUNNING (2<<0)
+#define S_MSG_PENDING  (2<<0)
+#define S_CON_PENDING  (3<<0)
 
 static inline 
 void my_puts(const char *s)
@@ -43,19 +47,15 @@ void my_puts(const char *s)
        fputs(s, stdout);
 }
 
-#ifdef __AVR__
 static inline 
 void my_puts_P(const char *s)
 {
+#ifdef __AVR__
        fputs_P(s, stdout);
-}
-
 #else
-static inline
-void my_puts_P(const char *s)
-{
        fputs(s, stdout);
-}
 #endif /* __AVR__ */
+}
+
 #endif /* COMMON_H */