aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/libopencm3/stm32/f2/spi.h13
-rw-r--r--include/libopencm3/stm32/f4/spi.h15
2 files changed, 15 insertions, 13 deletions
diff --git a/include/libopencm3/stm32/f2/spi.h b/include/libopencm3/stm32/f2/spi.h
index 2fdec7e..10f7989 100644
--- a/include/libopencm3/stm32/f2/spi.h
+++ b/include/libopencm3/stm32/f2/spi.h
@@ -23,20 +23,21 @@
#include <libopencm3/stm32/spi.h>
/*
- * This file extends the version in stm_common with definitions only
+ * This file extends the common STM32 version with definitions only
* applicable to the STM32F2 series of devices.
*/
/* --- SPI_CR2 values ------------------------------------------------------ */
-/* FRF: Frame format. */
+/* FRF: Frame format */
+/* Note: Not used in I2S mode. */
#define SPI_CR2_FRF (1 << 4)
-#define SPI_CR2_FRF_TI (1 << 4)
-#define SPI_CR2_FRF_MOTOROLA (1 << 4)
+#define SPI_CR2_FRF_MOTOROLA_MODE (0 << 4)
+#define SPI_CR2_FRF_TI_MODE (1 << 4)
/* --- SPI_SR values ------------------------------------------------------- */
-/* TIFRFE: TI frame format error. */
-#define SPI_SR_RXNE (1 << 0)
+/* TIFRFE: TI frame format error */
+#define SPI_SR_TIFRFE (1 << 8)
#endif
diff --git a/include/libopencm3/stm32/f4/spi.h b/include/libopencm3/stm32/f4/spi.h
index 0d29e67..e87ed6c 100644
--- a/include/libopencm3/stm32/f4/spi.h
+++ b/include/libopencm3/stm32/f4/spi.h
@@ -23,20 +23,21 @@
#include <libopencm3/stm32/spi.h>
/*
- * This file extends the version in stm_common with definitions only
- * applicable to the STM32F2 series of devices.
+ * This file extends the common STM32 version with definitions only
+ * applicable to the STM32F4 series of devices.
*/
/* --- SPI_CR2 values ------------------------------------------------------ */
-/* FRF: Frame format. */
+/* FRF: Frame format */
+/* Note: Not used in I2S mode. */
#define SPI_CR2_FRF (1 << 4)
-#define SPI_CR2_FRF_TI (1 << 4)
-#define SPI_CR2_FRF_MOTOROLA (1 << 4)
+#define SPI_CR2_FRF_MOTOROLA_MODE (0 << 4)
+#define SPI_CR2_FRF_TI_MODE (1 << 4)
/* --- SPI_SR values ------------------------------------------------------- */
-/* TIFRFE: TI frame format error. */
-#define SPI_SR_RXNE (1 << 0)
+/* TIFRFE: TI frame format error */
+#define SPI_SR_TIFRFE (1 << 8)
#endif