aboutsummaryrefslogtreecommitdiff
path: root/lib
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
parent2095715eb1de61b0f58129923e0a8ad4ae3706e0 (diff)
parent4809f7dacf70253f894460683be5c08d76a800a7 (diff)
Merge branch 'stm32f2' of github.com:fnoble/libopenstm32 into stm32f2
Diffstat (limited to 'lib')
-rw-r--r--lib/stm32_common/spi.c16
-rw-r--r--lib/stm32f1/scb.c2
-rw-r--r--lib/usb/usb_f103.c4
-rw-r--r--lib/usb/usb_f107.c2
4 files changed, 19 insertions, 5 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);
}
diff --git a/lib/stm32f1/scb.c b/lib/stm32f1/scb.c
index dfee6c3..54c5776 100644
--- a/lib/stm32f1/scb.c
+++ b/lib/stm32f1/scb.c
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <libopencm3/stm32/scb.h>
+#include <libopencm3/stm32/f1/scb.h>
void scb_reset_core(void)
{
diff --git a/lib/usb/usb_f103.c b/lib/usb/usb_f103.c
index 594d3c6..ea173d7 100644
--- a/lib/usb/usb_f103.c
+++ b/lib/usb/usb_f103.c
@@ -17,10 +17,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/cm3/common.h>
#include <libopencm3/stm32/tools.h>
-#include <libopencm3/stm32/usb.h>
+#include <libopencm3/stm32/f1/usb.h>
#include <libopencm3/usb/usbd.h>
#include "usb_private.h"
diff --git a/lib/usb/usb_f107.c b/lib/usb/usb_f107.c
index 134b728..65c76b4 100644
--- a/lib/usb/usb_f107.c
+++ b/lib/usb/usb_f107.c
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/f1/rcc.h>
#include <libopencm3/cm3/common.h>
#include <libopencm3/stm32/tools.h>
#include <libopencm3/stm32/otg_fs.h>