cmd_attach.c, cmd_boot.c, cmd_loadcpm3.c: use cmd_error()

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

diff --git a/include/common.h b/include/common.h
index dea638aa7d0261f808890992a4065a4d30317e85..12d87c48865a280eac621ba3e7df7ddc006b6e6b 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -9,6 +9,15 @@
 
 #include <stdio.h>
 #include <stdint.h>
+#include <stdbool.h>
+#include <string.h>
+#include <stdlib.h>
+#include "errnum.h"
+
+#define GCC_VERSION (__GNUC__*10000 + __GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__)
+
+#define USED __attribute__((used))
+#define UNUSED __attribute__((unused))
 
 #ifdef __AVR__
 #include <avr/io.h>
@@ -30,10 +39,13 @@ struct bits {
 
 #define SBIT(port,pin) ((*(volatile struct bits*)&port).b##pin)
 
-//TODO:
+//GCC bug PR61443
 //  Known to work: 4.8.4, 4.9.1
 //  Known to fail: 4.8.3, 4.9.0
+
+#if (GCC_VERSION < 40804) || (GCC_VERSION == 40900)
 #define GCC_BUG_61443 1
+#endif /* PR61443 */
 
 #else
 // TODO: stm32
@@ -71,18 +83,18 @@ extern volatile uint_least8_t Stat;
 #define S_CON_PENDING  (1<<2)
 
 static inline
-void my_puts(const char *s)
+int my_puts(const char *s)
 {
-       fputs(s, stdout);
+       return fputs(s, stdout);
 }
 
 static inline
-void my_puts_P(const char *s)
+int my_puts_P(const char *s)
 {
 #ifdef __AVR__
-       fputs_P(s, stdout);
+       return fputs_P(s, stdout);
 #else
-       fputs(s, stdout);
+       return fputs(s, stdout);
 #endif /* __AVR__ */
 }