jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

[stm32] SPI includes got jumbled for for DFF

Browse Source 
DFF exists at bit 11 for f1, f2, f4 and l1, but the f0 and f3 have that bit as
CRC len and use CR2 for data size bits instead.  The merging of the F3 and F0
and attempts to put common data in common places broke the l1 code.

F3 and F0 SPI headers are still almost completely identical.
This commit is contained in:
Karl Palsson 2013-09-11 22:04:03 +00:00
parent 5ea4e8842a
commit 8e44177a66
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/libopencm3/stm32/common/spi_common_f24.h
View File

@ -34,13 +34,15 @@ specific memorymap.h header before including this header file.*/
/**@{*/ /**@{*/
#include <libopencm3/stm32/common/spi_common_f124.h> #include <libopencm3/stm32/common/spi_common_l1f124.h>
/* /*
* This file extends the common STM32 version with definitions only * This file extends the common STM32 version with definitions only
* applicable to the STM32F2/4 series of devices. * applicable to the STM32F2/4 series of devices.
*/ */
/* Note, these values are also on the F0, but other parts are _not_ */
/* --- SPI_CR2 values ------------------------------------------------------ */ /* --- SPI_CR2 values ------------------------------------------------------ */
/* FRF: Frame format */ /* FRF: Frame format */

6
include/libopencm3/stm32/common/spi_common_f124.h → include/libopencm3/stm32/common/spi_common_l1f124.h
View File

@ -29,8 +29,8 @@ specific memorymap.h header before including this header file.*/
/** @cond */ /** @cond */
#ifdef LIBOPENCM3_SPI_H #ifdef LIBOPENCM3_SPI_H
/** @endcond */ /** @endcond */
#ifndef LIBOPENCM3_SPI_COMMON_F0124_H #ifndef LIBOPENCM3_SPI_COMMON_L1F124_H
#define LIBOPENCM3_SPI_COMMON_F0124_H #define LIBOPENCM3_SPI_COMMON_L1F124_H
/**@{*/ /**@{*/
@ -38,7 +38,7 @@ specific memorymap.h header before including this header file.*/
/* /*
* This file extends the common STM32 version with definitions only * This file extends the common STM32 version with definitions only
* applicable to the STM32F0/1/2/4 series of devices. * applicable to the STM32L1/F1/2/4 series of devices.
*/ */
/* DFF: Data frame format */ /* DFF: Data frame format */

2
include/libopencm3/stm32/f1/spi.h
View File

@ -32,7 +32,7 @@ LGPL License Terms @ref lgpl_license
#define LIBOPENCM3_SPI_H #define LIBOPENCM3_SPI_H
#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/memorymap.h>
#include <libopencm3/stm32/common/spi_common_f124.h> #include <libopencm3/stm32/common/spi_common_l1f124.h>
#endif #endif

2
include/libopencm3/stm32/l1/spi.h
View File

@ -32,7 +32,7 @@ LGPL License Terms @ref lgpl_license
#define LIBOPENCM3_SPI_H #define LIBOPENCM3_SPI_H
#include <libopencm3/stm32/memorymap.h> #include <libopencm3/stm32/memorymap.h>
#include <libopencm3/stm32/common/spi_common_all.h> #include <libopencm3/stm32/common/spi_common_l1f124.h>
#endif #endif