X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstmf0%2Fao_arch_funcs.h;h=8a173b57e5be79e928bebb5acf6ffb0bc1fa3d72;hb=2fdf4e798bd67b0d7e96f2b8fff49915b71b089e;hp=defe259896e67b4eaf0f78ae0be48808dddcbede;hpb=341157c7415fcf879696c9d8167722a0c5ff264c;p=fw%2Faltos

diff --git a/src/stmf0/ao_arch_funcs.h b/src/stmf0/ao_arch_funcs.h
index defe2598..8a173b57 100644
--- a/src/stmf0/ao_arch_funcs.h
+++ b/src/stmf0/ao_arch_funcs.h
@@ -73,6 +73,18 @@ ao_spi_speed(uint32_t hz)
 
 #define AO_SPI_INDEX(id)	((id) & AO_SPI_INDEX_MASK)
 #define AO_SPI_CONFIG(id)	((id) & AO_SPI_CONFIG_MASK)
+#define AO_SPI_PIN_CONFIG(id)	((id) & (AO_SPI_INDEX_MASK | AO_SPI_CONFIG_MASK))
+
+#define AO_SPI_CPOL_BIT		4
+#define AO_SPI_CPHA_BIT		5
+#define AO_SPI_CPOL(id)		((uint32_t) (((id) >> AO_SPI_CPOL_BIT) & 1))
+#define AO_SPI_CPHA(id)		((uint32_t) (((id) >> AO_SPI_CPHA_BIT) & 1))
+
+#define AO_SPI_MAKE_MODE(pol,pha)	(((pol) << AO_SPI_CPOL_BIT) | ((pha) << AO_SPI_CPHA_BIT))
+#define AO_SPI_MODE_0		AO_SPI_MAKE_MODE(0,0)
+#define AO_SPI_MODE_1		AO_SPI_MAKE_MODE(0,1)
+#define AO_SPI_MODE_2		AO_SPI_MAKE_MODE(1,0)
+#define AO_SPI_MODE_3		AO_SPI_MAKE_MODE(1,1)
 
 uint8_t
 ao_spi_try_get(uint8_t spi_index, uint32_t speed, uint8_t task_id);
@@ -139,7 +151,7 @@ ao_spi_recv_byte(uint8_t spi_index)
 	stm_spi->dr = 0xff;
 	while (!(stm_spi->sr & (1 << STM_SPI_SR_RXNE)))
 		;
-	return stm_spi->dr;
+	return (uint8_t) stm_spi->dr;
 }
 
 void
@@ -203,16 +215,16 @@ static inline void ao_enable_port(struct stm_gpio *port)
 static inline void ao_disable_port(struct stm_gpio *port)
 {
 	if ((port) == &stm_gpioa) {
-		stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_IOPAEN);
+		stm_rcc.ahbenr &= ~(1UL << STM_RCC_AHBENR_IOPAEN);
 		ao_power_unregister(&ao_power_gpioa);
 	} else if ((port) == &stm_gpiob) {
-		stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_IOPBEN);
+		stm_rcc.ahbenr &= ~(1UL << STM_RCC_AHBENR_IOPBEN);
 		ao_power_unregister(&ao_power_gpiob);
 	} else if ((port) == &stm_gpioc) {
-		stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_IOPCEN);
+		stm_rcc.ahbenr &= ~(1UL << STM_RCC_AHBENR_IOPCEN);
 		ao_power_unregister(&ao_power_gpioc);
 	} else if ((port) == &stm_gpiof) {
-		stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_IOPFEN);
+		stm_rcc.ahbenr &= ~(1UL << STM_RCC_AHBENR_IOPFEN);
 		ao_power_unregister(&ao_power_gpiof);
 	}
 }