Merge remote-tracking branch 'mjb/master'

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

diff --git a/src/stm/ao_arch_funcs.h b/src/stm/ao_arch_funcs.h
index 05bb77843ec2ba9081e7a9b92a17e6b1ce1386c2..d4fbea37ea8f0afe94fc8d0d44fad8b617d54d6d 100644 (file)
--- a/src/stm/ao_arch_funcs.h
+++ b/src/stm/ao_arch_funcs.h
@@ -20,10 +20,39 @@
 
 /* ao_spi_stm.c
  */
-extern uint8_t ao_spi_mutex[STM_NUM_SPI];
+
+#define AO_SPI_SPEED_FAST      STM_SPI_CR1_BR_PCLK_4
+#define AO_SPI_SPEED_1MHz      STM_SPI_CR1_BR_PCLK_16
+#define AO_SPI_SPEED_200kHz    STM_SPI_CR1_BR_PCLK_256
+
+#define AO_SPI_CONFIG_1                0x00
+#define AO_SPI_1_CONFIG_PA5_PA6_PA7    AO_SPI_CONFIG_1
+#define AO_SPI_2_CONFIG_PB13_PB14_PB15 AO_SPI_CONFIG_1
+
+#define AO_SPI_CONFIG_2                0x04
+#define AO_SPI_1_CONFIG_PB3_PB4_PB5    AO_SPI_CONFIG_2
+#define AO_SPI_2_CONFIG_PD1_PD3_PD4    AO_SPI_CONFIG_2
+
+#define AO_SPI_CONFIG_3                0x08
+#define AO_SPI_1_CONFIG_PE13_PE14_PE15 AO_SPI_CONFIG_3
+
+#define AO_SPI_CONFIG_NONE     0x0c
+
+#define AO_SPI_INDEX_MASK      0x01
+#define AO_SPI_CONFIG_MASK     0x0c
+
+#define AO_SPI_1_PA5_PA6_PA7   (STM_SPI_INDEX(1) | AO_SPI_1_CONFIG_PA5_PA6_PA7)
+#define AO_SPI_1_PB3_PB4_PB5   (STM_SPI_INDEX(1) | AO_SPI_1_CONFIG_PB3_PB4_PB5)
+#define AO_SPI_1_PE13_PE14_PE15        (STM_SPI_INDEX(1) | AO_SPI_1_CONFIG_PE13_PE14_PE15)
+
+#define AO_SPI_2_PB13_PB14_PB15        (STM_SPI_INDEX(2) | AO_SPI_2_CONFIG_PB13_PB14_PB15)
+#define AO_SPI_2_PD1_PD3_PD4   (STM_SPI_INDEX(2) | AO_SPI_2_CONFIG_PD1_PD3_PD4)
+
+#define AO_SPI_INDEX(id)       ((id) & AO_SPI_INDEX_MASK)
+#define AO_SPI_CONFIG(id)      ((id) & AO_SPI_CONFIG_MASK)
 
 void
-ao_spi_get(uint8_t spi_index);
+ao_spi_get(uint8_t spi_index, uint32_t speed);
 
 void
 ao_spi_put(uint8_t spi_index);
@@ -40,36 +69,62 @@ ao_spi_recv(void *block, uint16_t len, uint8_t spi_index);
 void
 ao_spi_duplex(void *out, void *in, uint16_t len, uint8_t spi_index);
 
+extern uint16_t        ao_spi_speed[STM_NUM_SPI];
+
 void
 ao_spi_init(void);
 
-#define ao_spi_get_mask(reg,mask,bus) do {             \
-               ao_spi_get(bus);                        \
-               (reg).bsrr = ((uint32_t) mask) << 16;   \
+#define ao_spi_get_mask(reg,mask,bus, speed) do {              \
+               ao_spi_get(bus, speed);                         \
+               (reg)->bsrr = ((uint32_t) mask) << 16;  \
        } while (0)
 
 #define ao_spi_put_mask(reg,mask,bus) do {     \
-               (reg).bsrr = mask;              \
+               (reg)->bsrr = mask;             \
                ao_spi_put(bus);                \
        } 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_enable_port(port) do {                                      \
-               if (&(port) == &stm_gpioa)                              \
+               if ((port) == &stm_gpioa)                               \
                        stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIOAEN); \
-               else if (&(port) == &stm_gpiob)                         \
+               else if ((port) == &stm_gpiob)                          \
                        stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIOBEN); \
-               else if (&(port) == &stm_gpioc)                         \
+               else if ((port) == &stm_gpioc)                          \
                        stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIOCEN); \
-               else if (&(port) == &stm_gpiod)                         \
+               else if ((port) == &stm_gpiod)                          \
                        stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIODEN); \
-               else if (&(port) == &stm_gpioe)                         \
+               else if ((port) == &stm_gpioe)                          \
                        stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIOEEN); \
        } while (0)
 
 
+#define ao_gpio_set(port, bit, pin, v) stm_gpio_set(port, bit, v)
+
+#define ao_gpio_get(port, bit, pin) stm_gpio_get(port, bit)
+
+#define ao_enable_output(port,bit,pin,v) do {                  \
+               ao_enable_port(port);                           \
+               ao_gpio_set(port, bit, pin, v);                 \
+               stm_moder_set(port, bit, STM_MODER_OUTPUT);\
+       } while (0)
+
+#define ao_enable_input(port,bit,mode) do {                            \
+               ao_enable_port(port);                                   \
+               stm_moder_set(port, bit, STM_MODER_INPUT);              \
+               if (mode == AO_EXTI_MODE_PULL_UP)                       \
+                       stm_pupdr_set(port, bit, STM_PUPDR_PULL_UP);    \
+               else if (mode == AO_EXTI_MODE_PULL_DOWN)                \
+                       stm_pupdr_set(port, bit, STM_PUPDR_PULL_DOWN);  \
+               else                                                    \
+                       stm_pupdr_set(port, bit, STM_PUPDR_NONE);       \
+       } while (0)
+
 #define ao_enable_cs(port,bit) do {                            \
-               stm_gpio_set(&(port), bit, 1);                  \
-               stm_moder_set(&(port), bit, STM_MODER_OUTPUT);  \
+               stm_gpio_set((port), bit, 1);                   \
+               stm_moder_set((port), bit, STM_MODER_OUTPUT);   \
        } while (0)
 
 #define ao_spi_init_cs(port, mask) do {                                \
@@ -105,7 +160,7 @@ ao_dma_set_transfer(uint8_t                 index,
                    uint32_t            ccr);
 
 void
-ao_dma_set_isr(uint8_t index, void (*isr)(void));
+ao_dma_set_isr(uint8_t index, void (*isr)(int index));
 
 void
 ao_dma_start(uint8_t index);
@@ -133,11 +188,11 @@ ao_i2c_start(uint8_t i2c_index, uint16_t address);
 void
 ao_i2c_put(uint8_t i2c_index);
 
-void
-ao_i2c_send(void *block, uint16_t len, uint8_t i2c_index);
+uint8_t
+ao_i2c_send(void *block, uint16_t len, uint8_t i2c_index, uint8_t stop);
 
-void
-ao_i2c_recv(void *block, uint16_t len, uint8_t i2c_index);
+uint8_t
+ao_i2c_recv(void *block, uint16_t len, uint8_t i2c_index, uint8_t stop);
 
 void
 ao_i2c_init(void);