From 46f90a54ae3f8fb7ba417f202e899e8d69946b84 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Thu, 10 Nov 2011 22:15:45 +0100 Subject: STM32F2/F4: SPI fixes. - Rename SPI_CR2_FRF_TI to SPI_CR2_FRF_TI_MODE to match datasheet. - Rename SPI_CR2_FRF_MOTOROLA to SPI_CR2_FRF_MOTOROLA_MODE (see above). - Fix SPI_CR2_FRF_MOTOROLA_MODE bit definition, must be (0 << 4). - Change SPI_SR_RXNE to SPI_SR_TIFRFE; this was probably a copy-paste error. Also, the bit definition is (1 << 8). --- include/libopencm3/stm32/f2/spi.h | 13 +++++++------ include/libopencm3/stm32/f4/spi.h | 15 ++++++++------- 2 files changed, 15 insertions(+), 13 deletions(-) (limited to 'include/libopencm3/stm32') 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 /* - * 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 /* - * 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 -- cgit v1.2.3