aboutsummaryrefslogtreecommitdiff
path: root/lib/stm32_common/spi.c
diff options
context:
space:
mode:
authorFergus Noble2011-10-12 23:59:16 -0700
committerFergus Noble2011-10-12 23:59:16 -0700
commit82768447c8f262ac0ce64cf8567cea0372bf2b83 (patch)
tree70dbbbc5fb7b92ae53bb1078dbe9d306b5e7e50c /lib/stm32_common/spi.c
parent2095715eb1de61b0f58129923e0a8ad4ae3706e0 (diff)
parent4809f7dacf70253f894460683be5c08d76a800a7 (diff)
Merge branch 'stm32f2' of github.com:fnoble/libopenstm32 into stm32f2
Diffstat (limited to 'lib/stm32_common/spi.c')
-rw-r--r--lib/stm32_common/spi.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/lib/stm32_common/spi.c b/lib/stm32_common/spi.c
index 7fb8711..71bb846 100644
--- a/lib/stm32_common/spi.c
+++ b/lib/stm32_common/spi.c
@@ -77,7 +77,7 @@ void spi_write(u32 spi, u16 data)
void spi_send(u32 spi, u16 data)
{
/* 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. */
SPI_DR(spi) = data;
@@ -85,6 +85,20 @@ void spi_send(u32 spi, u16 data)
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. */
return SPI_DR(spi);
}