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 9ad14fbbad0144e4b960c32be95a82244c293a67..792ff7440bf724d5e824abf351cd391891a52a0a 100644 (file)
--- a/src/avr/ao_arch_funcs.h
+++ b/src/avr/ao_arch_funcs.h
@@ -21,24 +21,35 @@
 
 extern __xdata uint8_t ao_spi_mutex;
 
-#define ao_spi_get_mask(reg,mask) do {\
-       ao_mutex_get(&ao_spi_mutex); \
-       (reg) &= ~(mask); \
+#define ao_spi_get_mask(reg,mask,bus,speed) do {       \
+               ao_mutex_get(&ao_spi_mutex);    \
+               (reg) &= ~(mask);               \
        } while (0)
 
-#define ao_spi_put_mask(reg,mask) do { \
-       (reg) |= (mask); \
-       ao_mutex_put(&ao_spi_mutex); \
+#define ao_spi_put_mask(reg,mask,bus) do {     \
+               (reg) |= (mask);                \
+               ao_mutex_put(&ao_spi_mutex);    \
        } while (0)
 
-#define ao_spi_get_bit(bit) do {\
-       ao_mutex_get(&ao_spi_mutex); \
-       (bit) = 0; \
+#define ao_spi_get_bit(reg,bit,pin,bus,speed) do {     \
+               ao_mutex_get(&ao_spi_mutex);    \
+               (pin) = 0;                      \
        } while (0)
 
-#define ao_spi_put_bit(bit) do { \
-       (bit) = 1; \
-       ao_mutex_put(&ao_spi_mutex); \
+#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)
 
 /*
@@ -47,12 +58,25 @@ extern __xdata uint8_t      ao_spi_mutex;
  * 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(void __xdata *block, uint16_t len) __reentrant;
+ao_spi_send_bus(void __xdata *block, uint16_t len) __reentrant;
 
 void
-ao_spi_recv(void __xdata *block, uint16_t len) __reentrant;
+ao_spi_recv_bus(void __xdata *block, uint16_t len) __reentrant;
+
+#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)
 
 void
 ao_spi_init(void);
 
+#define ao_spi_init_cs(port, mask) do {                \
+               SPI_CS_PORT |= (mask);          \
+               SPI_CS_DIR |= (mask);           \
+       } while (0)