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

Minor fixes to the SPI code, mainly you should check that the TX buffer is empty before rather than after sending.

Browse Source
This commit is contained in:
Fergus Noble 2011-09-23 13:04:54 -07:00
parent 6ec01401e1
commit 3c67ef7d07
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/stm32_common/spi.c
View File

@ -54,11 +54,7 @@ int spi_init_master(u32 spi, u32 br, u32 cpol, u32 cpha, u32 dff, u32 lsbfirst)
/* TODO: Error handling? */ /* TODO: Error handling? */
void spi_enable(u32 spi) void spi_enable(u32 spi)
{ {
u32 reg32; SPI_CR1(spi) |= SPI_CR1_SPE; /* Enable SPI. */
reg32 = SPI_CR1(spi);
reg32 |= SPI_CR1_SPE; /* Enable SPI. */
SPI_CR1(spi) = reg32;
} }
/* TODO: Error handling? */ /* TODO: Error handling? */
@ -80,13 +76,11 @@ 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 */
while (SPI_SR(spi) & SPI_SR_BSY );
/* 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;
/* wait for transfer finished */
while (SPI_SR(spi) & SPI_SR_BSY )
{
}
} }
u16 spi_read(u32 spi) u16 spi_read(u32 spi)