X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstmf0%2Fao_arch_funcs.h;h=d46899d575c409f149fd7e50767debb0422f24d1;hb=HEAD;hp=591ca8a07576fb01a2888754d5f372fc9ab0ac47;hpb=009d56b4f03c1ba3c9a36bdb54c772ad21844057;p=fw%2Faltos

diff --git a/src/stmf0/ao_arch_funcs.h b/src/stmf0/ao_arch_funcs.h
index 591ca8a0..953a0c00 100644
--- a/src/stmf0/ao_arch_funcs.h
+++ b/src/stmf0/ao_arch_funcs.h
@@ -26,20 +26,28 @@
 
 /* PCLK is set to 48MHz (HCLK 48MHz, HPRE 1, PPRE 1) */
 
-#define AO_SPI_SPEED_24MHz	STM_SPI_CR1_BR_PCLK_2
-#define AO_SPI_SPEED_12MHz	STM_SPI_CR1_BR_PCLK_4
-#define AO_SPI_SPEED_6MHz	STM_SPI_CR1_BR_PCLK_8
-#define AO_SPI_SPEED_3MHz	STM_SPI_CR1_BR_PCLK_16
-#define AO_SPI_SPEED_1500kHz	STM_SPI_CR1_BR_PCLK_32
-#define AO_SPI_SPEED_750kHz	STM_SPI_CR1_BR_PCLK_64
-#define AO_SPI_SPEED_375kHz	STM_SPI_CR1_BR_PCLK_128
-#define AO_SPI_SPEED_187500Hz	STM_SPI_CR1_BR_PCLK_256
+#define _AO_SPI_SPEED_24MHz	STM_SPI_CR1_BR_PCLK_2
+#define _AO_SPI_SPEED_12MHz	STM_SPI_CR1_BR_PCLK_4
+#define _AO_SPI_SPEED_6MHz	STM_SPI_CR1_BR_PCLK_8
+#define _AO_SPI_SPEED_3MHz	STM_SPI_CR1_BR_PCLK_16
+#define _AO_SPI_SPEED_1500kHz	STM_SPI_CR1_BR_PCLK_32
+#define _AO_SPI_SPEED_750kHz	STM_SPI_CR1_BR_PCLK_64
+#define _AO_SPI_SPEED_375kHz	STM_SPI_CR1_BR_PCLK_128
+#define _AO_SPI_SPEED_187500Hz	STM_SPI_CR1_BR_PCLK_256
 
-#define AO_SPI_SPEED_FAST	AO_SPI_SPEED_24MHz
-
-/* Companion bus wants something no faster than 200kHz */
-
-#define AO_SPI_SPEED_200kHz	AO_SPI_SPEED_187500Hz
+static inline uint32_t
+ao_spi_speed(int index, uint32_t hz)
+{
+	(void) index;
+	if (hz >=24000000) return _AO_SPI_SPEED_24MHz;
+	if (hz >=12000000) return _AO_SPI_SPEED_12MHz;
+	if (hz >= 6000000) return _AO_SPI_SPEED_6MHz;
+	if (hz >= 3000000) return _AO_SPI_SPEED_3MHz;
+	if (hz >= 1500000) return _AO_SPI_SPEED_1500kHz;
+	if (hz >=  750000) return _AO_SPI_SPEED_750kHz;
+	if (hz >=  375000) return _AO_SPI_SPEED_375kHz;
+	return _AO_SPI_SPEED_187500Hz;
+}
 
 #define AO_SPI_CONFIG_1		0x00
 #define AO_SPI_1_CONFIG_PA5_PA6_PA7	AO_SPI_CONFIG_1
@@ -66,6 +74,18 @@
 
 #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);
@@ -76,6 +96,9 @@ ao_spi_get(uint8_t spi_index, uint32_t speed);
 void
 ao_spi_put(uint8_t spi_index);
 
+void
+ao_spi_put_pins(uint8_t spi_index);
+
 void
 ao_spi_send(const void *block, uint16_t len, uint8_t spi_index);
 
@@ -132,7 +155,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
@@ -141,8 +164,6 @@ 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);
 
@@ -198,16 +219,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);
 	}
 }
@@ -387,9 +408,8 @@ ao_arch_memory_barrier(void) {
 
 #if HAS_TASK
 static inline void
-ao_arch_init_stack(struct ao_task *task, void *start)
+ao_arch_init_stack(struct ao_task *task, uint32_t *sp, void *start)
 {
-	uint32_t	*sp = &task->stack32[AO_STACK_SIZE >> 2];
 	uint32_t	a = (uint32_t) start;
 	int		i;