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

Implement SPI clean disable from TODO comment

Browse Source
This commit is contained in:
Zachary Crockett 2013-02-26 17:30:48 +08:00 committed by Piotr Esden-Tempski
parent 8a0b8fa9d8
commit 9d24a480ae
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/libopencm3/stm32/common/spi_common_all.h
View File

@ -350,6 +350,7 @@ void spi_reset(u32 spi_peripheral);
int spi_init_master(u32 spi, u32 br, u32 cpol, u32 cpha, u32 dff, u32 lsbfirst); int spi_init_master(u32 spi, u32 br, u32 cpol, u32 cpha, u32 dff, u32 lsbfirst);
void spi_enable(u32 spi); void spi_enable(u32 spi);
void spi_disable(u32 spi); void spi_disable(u32 spi);
void spi_clean_disable(u32 spi);
void spi_write(u32 spi, u16 data); void spi_write(u32 spi, u16 data);
void spi_send(u32 spi, u16 data); void spi_send(u32 spi, u16 data);
u16 spi_read(u32 spi); u16 spi_read(u32 spi);

35
lib/stm32/common/spi_common_all.c
View File

@ -163,9 +163,6 @@ void spi_enable(u32 spi)
The SPI peripheral is disabled. The SPI peripheral is disabled.
@todo Follow procedure from section 23.3.8 in the TRM.
(possibly create a "clean disable" function separately)
@param[in] spi Unsigned int32. SPI peripheral identifier @ref spi_reg_base. @param[in] spi Unsigned int32. SPI peripheral identifier @ref spi_reg_base.
*/ */
@ -178,6 +175,38 @@ void spi_disable(u32 spi)
SPI_CR1(spi) = reg32; SPI_CR1(spi) = reg32;
} }
/*-----------------------------------------------------------------------------*/
/** @brief SPI Clean Disable.
Disable the SPI peripheral according to the procedure in section 23.3.8 of the
reference manual. This prevents corruption of any ongoing transfers and
prevents the BSY flag from becoming unreliable.
@param[in] spi Unsigned int32. SPI peripheral identifier @ref spi_reg_base.
@returns data Unsigned int16. 8 or 16 bit data from final read.
*/
u16 spi_clean_disable(u32 spi)
{
/* Wait to receive last data */
while (!(SPI_SR(spi) & SPI_SR_RXNE))
;
u16 data = SPI_DR(spi);
/* Wait to transmit last data */
while (!(SPI_SR(spi) & SPI_SR_TXE))
;
/* Wait until not busy */
while (SPI_SR(spi) & SPI_SR_BSY)
;
SPI_CR1(spi) &= ~SPI_CR1_SPE;
return data;
}
/*-----------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------*/
/** @brief SPI Data Write. /** @brief SPI Data Write.