From 26331e248f87b8d640054c91b581f482cd89bede Mon Sep 17 00:00:00 2001
From: Leo C <erbl259-lmu@yahoo.de>
Date: Sat, 22 Nov 2014 17:30:41 +0100
Subject: [PATCH] Move macro SBIT to common.h

---
 avr/z80-if.c     | 21 +--------------------
 include/common.h | 20 ++++++++++++++++----
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/avr/z80-if.c b/avr/z80-if.c
index 9492c28..4544997 100644
--- a/avr/z80-if.c
+++ b/avr/z80-if.c
@@ -53,31 +53,12 @@
 
  */
 
-#include <avr/io.h>
+#include "common.h"
 #include <util/atomic.h>
-#include <stdio.h>
 #include "debug.h"
 #include "z80-if.h"
 
 
-/* Number of array elements */
-#define NELEMS(x)  (sizeof x/sizeof *x)
-
-struct bits {
-  uint8_t b0:1;
-  uint8_t b1:1;
-  uint8_t b2:1;
-  uint8_t b3:1;
-  uint8_t b4:1;
-  uint8_t b5:1;
-  uint8_t b6:1;
-  uint8_t b7:1;
-} __attribute__((__packed__));
-
-typedef struct bits pbit_t;
-
-#define SBIT(port,pin) ((*(volatile struct bits*)&port).b##pin)
-
 
 //#define P_ZCLK		PORTB
 //#define ZCLK		5
diff --git a/include/common.h b/include/common.h
index 121922f..b0dd038 100644
--- a/include/common.h
+++ b/include/common.h
@@ -8,6 +8,19 @@
 
 #define udelay(n)  _delay_us(n)
 
+struct bits {
+  uint8_t b0:1;
+  uint8_t b1:1;
+  uint8_t b2:1;
+  uint8_t b3:1;
+  uint8_t b4:1;
+  uint8_t b5:1;
+  uint8_t b6:1;
+  uint8_t b7:1;
+} __attribute__((__packed__));
+
+#define SBIT(port,pin) ((*(volatile struct bits*)&port).b##pin)
+
 //TODO:
 //  Known to work: 4.8.4, 4.9.1
 //  Known to fail: 4.8.3, 4.9.0
@@ -25,7 +38,7 @@
 #else
 #define FLASH
 #define MEMX
-#endif 
+#endif
 
 #define stringify(s)	tostring(s)
 #define tostring(s)	#s
@@ -44,13 +57,13 @@ extern volatile uint_least8_t Stat;
 #define S_MSG_PENDING	(1<<1)
 #define S_CON_PENDING	(1<<2)
 
-static inline 
+static inline
 void my_puts(const char *s)
 {
 	fputs(s, stdout);
 }
 
-static inline 
+static inline
 void my_puts_P(const char *s)
 {
 #ifdef __AVR__
@@ -61,4 +74,3 @@ void my_puts_P(const char *s)
 }
 
 #endif /* COMMON_H */
-
-- 
2.39.2