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

Added alternative function for doing an SPI transfer.

Browse Source
This commit is contained in:
Fergus Noble 2011-10-04 16:06:01 -07:00
parent 71909482de
commit 4809f7dacf
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/libopencm3/stm32/spi.h
View File

@ -290,6 +290,7 @@ void spi_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);
u16 spi_xfer(u32 spi, u16 data);
void spi_set_bidirectional_mode(u32 spi); void spi_set_bidirectional_mode(u32 spi);
void spi_set_unidirectional_mode(u32 spi); void spi_set_unidirectional_mode(u32 spi);
void spi_set_bidirectional_receive_only_mode(u32 spi); void spi_set_bidirectional_receive_only_mode(u32 spi);

16
lib/stm32_common/spi.c
View File

@ -77,7 +77,7 @@ void spi_write(u32 spi, u16 data)
void spi_send(u32 spi, u16 data) void spi_send(u32 spi, u16 data)
{ {
/* wait for transfer finished */ /* wait for transfer finished */
while (SPI_SR(spi) & SPI_SR_BSY ); while (!(SPI_SR(spi) & SPI_SR_TXE ));
/* Write data (8 or 16 bits, depending on DFF) into DR. */ /* Write data (8 or 16 bits, depending on DFF) into DR. */
SPI_DR(spi) = data; SPI_DR(spi) = data;
@ -85,6 +85,20 @@ void spi_send(u32 spi, u16 data)
u16 spi_read(u32 spi) u16 spi_read(u32 spi)
{ {
/* wait for transfer finished */
while (!(SPI_SR(spi) & SPI_SR_RXNE ));
/* Read the data (8 or 16 bits, depending on DFF bit) from DR. */
return SPI_DR(spi);
}
u16 spi_xfer(u32 spi, u16 data)
{
spi_write(spi, data);
/* wait for transfer finished */
while (!(SPI_SR(spi) & SPI_SR_RXNE ));
/* Read the data (8 or 16 bits, depending on DFF bit) from DR. */ /* Read the data (8 or 16 bits, depending on DFF bit) from DR. */
return SPI_DR(spi); return SPI_DR(spi);
} }