X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fattiny%2Fao_arch_funcs.h;h=e51f456b5965594aa4f075257109d8d292bcef79;hp=d4584a9fc1eeeb2dd028948ce3d78e427acd57ee;hb=HEAD;hpb=dcc51bb18985c24fa35bce0dd42ea3d847b960bf

diff --git a/src/attiny/ao_arch_funcs.h b/src/attiny/ao_arch_funcs.h
index d4584a9f..e3374ac5 100644
--- a/src/attiny/ao_arch_funcs.h
+++ b/src/attiny/ao_arch_funcs.h
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,28 +21,28 @@
  */
 
 #define ao_spi_get_mask(reg,mask,bus,speed) do {	\
-		(reg) &= ~(mask);			\
+		(reg) &= (uint8_t) ~(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) ao_spi_get_mask(reg,(1<<(bit)),bus,speed)
+#define ao_spi_get_bit(reg,bit,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_spi_put_bit(reg,bit,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)
 
-#define ao_gpio_set(port, bit, pin, v) do {	\
+#define ao_gpio_set(port, bit, v) do {	\
 		if (v)				\
 			PORTB |= (1 << bit);	\
 		else				\
 			PORTB &= ~(1 << bit);	\
 	} while (0)
 
-#define ao_gpio_get(port, bit, pin)	((PORTB >> (bit)) & 1)
+#define ao_gpio_get(port, bit)	((PORTB >> (bit)) & 1)
 
 /*
  * The SPI mutex must be held to call either of these
@@ -49,21 +50,23 @@
  * from chip select low to chip select high
  */
 
-#define ao_enable_output(port, bit, pin, v) do {			\
-		ao_gpio_set(port, bit, pin, v);				\
+#define ao_enable_output(port, bit, v) do {			\
+		ao_gpio_set(port, bit, v);				\
 		ao_gpio_token_evaluator(DDR,port) |= (1 << bit);	\
 	} while (0)
 
 
 void
-ao_spi_send_bus(void __xdata *block, uint16_t len) __reentrant;
+ao_spi_send_bus(void *block, uint16_t len);
 
 void
-ao_spi_recv_bus(void __xdata *block, uint16_t len) __reentrant;
+ao_spi_recv_bus(void *block, uint16_t len);
 
 #define ao_spi_send(block, len, bus) ao_spi_send_bus(block, len)
 #define ao_spi_recv(block, len, bus) ao_spi_recv_bus(block, len)
 
+#define AO_SPI_DUPLEX	0
+
 void
 ao_spi_init(void);
 
@@ -109,10 +112,10 @@ ao_i2c_init(void);
 /* notask.c */
 
 uint8_t
-ao_sleep(__xdata void *wchan);
+ao_sleep(void *wchan);
 
 void
-ao_wakeup(__xdata void *wchan);
+ao_wakeup(void *wchan);
 
 extern alt_t	ao_max_height;
 
@@ -120,3 +123,5 @@ extern void ao_report_altitude(void);
 
 void ao_delay_us(uint16_t us);
 
+void
+ao_led_toggle(uint8_t colors);