X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstm%2Fao_arch_funcs.h;h=7820bf798af2568e6b7ef4dc5bebf0394fda036d;hb=08a4ed8fe794a2b2b52147bd5535fe0954822e95;hp=447042dd6a0ad3bda8c04d8c74d5368dc780d7d9;hpb=6a973f788563ccc66b01cc7557a004dabef18d09;p=fw%2Faltos

diff --git a/src/stm/ao_arch_funcs.h b/src/stm/ao_arch_funcs.h
index 447042dd..7820bf79 100644
--- a/src/stm/ao_arch_funcs.h
+++ b/src/stm/ao_arch_funcs.h
@@ -22,8 +22,12 @@
  */
 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
+
 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 +44,47 @@ 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_enable_output(port,pin,v) do {			\
+		ao_enable_port(port);				\
+		stm_gpio_set(port, pin, v);			\
+		stm_moder_set(port, pin, STM_MODER_OUTPUT);	\
+	} 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 {				\