Timer 3 working with slower clock and all 16 bits.

[fw/altos] / src / avr / ao_arch_funcs.h

diff --git a/src/avr/ao_arch_funcs.h b/src/avr/ao_arch_funcs.h
index 1eeca6cc73c0f1490cc6c1240d55fdcf46df878a..792ff7440bf724d5e824abf351cd391891a52a0a 100644 (file)
--- a/src/avr/ao_arch_funcs.h
+++ b/src/avr/ao_arch_funcs.h
@@ -21,7 +21,7 @@
 
 extern __xdata uint8_t ao_spi_mutex;
 
-#define ao_spi_get_mask(reg,mask,bus) do {     \
+#define ao_spi_get_mask(reg,mask,bus,speed) do {       \
                ao_mutex_get(&ao_spi_mutex);    \
                (reg) &= ~(mask);               \
        } while (0)
@@ -31,22 +31,39 @@ extern __xdata uint8_t      ao_spi_mutex;
                ao_mutex_put(&ao_spi_mutex);    \
        } while (0)
 
-#define ao_spi_get_bit(bit) do {               \
+#define ao_spi_get_bit(reg,bit,pin,bus,speed) do {     \
                ao_mutex_get(&ao_spi_mutex);    \
-               (bit) = 0;                      \
+               (pin) = 0;                      \
        } while (0)
 
-#define ao_spi_put_bit(bit) do {               \
-               (bit) = 1;                      \
+#define ao_spi_put_bit(reg,bit,pin,bus) do {   \
+               (pin) = 1;                      \
                ao_mutex_put(&ao_spi_mutex);    \
        } while (0)
 
+
+#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 {                            \
+               if (v)                                                  \
+                       (ao_gpio_token_evaluator(PORT,port)) |= (1 << bit); \
+               else                                                    \
+                       (ao_gpio_token_evaluator(PORT,port)) &= ~(1 << bit); \
+       } while (0)
+
 /*
  * The SPI mutex must be held to call either of these
  * functions -- this mutex covers the entire SPI operation,
  * from chip select low to chip select high
  */
 
+#define ao_enable_output(port, bit, pin, v) do {                       \
+               ao_gpio_set(port, bit, pin, v);                         \
+               ao_gpio_token_evaluator(DDR,port) |= (1 << bit);        \
+       } while (0)
+
+
 void
 ao_spi_send_bus(void __xdata *block, uint16_t len) __reentrant;