X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fattiny%2Fao_arch_funcs.h;h=d4584a9fc1eeeb2dd028948ce3d78e427acd57ee;hp=8c9d1ae69a6dbe81135cf606c2c12ba738effb57;hb=2427eae5f3b429d302fbe14f708dcbc68c851954;hpb=64500ab11ab76d2309608f8e02a1dd9658963b3e

diff --git a/src/attiny/ao_arch_funcs.h b/src/attiny/ao_arch_funcs.h
index 8c9d1ae6..d4584a9f 100644
--- a/src/attiny/ao_arch_funcs.h
+++ b/src/attiny/ao_arch_funcs.h
@@ -20,21 +20,16 @@
  */
 
 #define ao_spi_get_mask(reg,mask,bus,speed) do {	\
-		(reg) &= ~(mask);		\
+		(reg) &= ~(mask);			\
 	} while (0)
 
 #define ao_spi_put_mask(reg,mask,bus) do {	\
 		(reg) |= (mask);		\
 	} while (0)
 
-#define ao_spi_get_bit(reg,bit,pin,bus,speed) do {	\
-		(pin) = 0;			\
-	} while (0)
-
-#define ao_spi_put_bit(reg,bit,pin,bus) do {	\
-		(pin) = 1;			\
-	} while (0)
+#define ao_spi_get_bit(reg,bit,pin,bus,speed) ao_spi_get_mask(reg,(1<<(bit)),bus,speed)
 
+#define ao_spi_put_bit(reg,bit,pin,bus) ao_spi_put_mask(reg,(1<<(bit)),bus)
 
 #define ao_gpio_token_paster(x,y)		x ## y
 #define ao_gpio_token_evaluator(x,y)	ao_gpio_token_paster(x,y)
@@ -46,6 +41,8 @@
 			PORTB &= ~(1 << bit);	\
 	} while (0)
 
+#define ao_gpio_get(port, bit, pin)	((PORTB >> (bit)) & 1)
+
 /*
  * The SPI mutex must be held to call either of these
  * functions -- this mutex covers the entire SPI operation,