X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstmf0%2Fao_arch_funcs.h;h=d46899d575c409f149fd7e50767debb0422f24d1;hb=f3a1e4de032d7a3d3af46df7aa4d3a21d80c0781;hp=190f9d1766ea7dbd96f1b95c9a2b6ac52c7f3061;hpb=4c5942fb082811f136322ec26de615cdb7e17580;p=fw%2Faltos

diff --git a/src/stmf0/ao_arch_funcs.h b/src/stmf0/ao_arch_funcs.h
index 190f9d17..d46899d5 100644
--- a/src/stmf0/ao_arch_funcs.h
+++ b/src/stmf0/ao_arch_funcs.h
@@ -26,20 +26,27 @@
 
 /* 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(uint32_t hz)
+{
+	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 +73,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);
@@ -141,8 +160,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);