aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libmaple/spi.c31
-rw-r--r--libmaple/spi.h3
-rw-r--r--wirish/comm/HardwareSPI.cpp8
-rw-r--r--wirish/comm/HardwareSPI.h3
4 files changed, 39 insertions, 6 deletions
diff --git a/libmaple/spi.c b/libmaple/spi.c
index ddc8346..aa75c5f 100644
--- a/libmaple/spi.c
+++ b/libmaple/spi.c
@@ -112,7 +112,7 @@ void spi_init(uint32 spi_num,
* @param spi_num which spi to send on
* @return data shifted back from the slave
*/
-void spi_tx(uint32 spi_num, uint8 data) {
+uint8 spi_tx_byte(uint32 spi_num, uint8 data) {
SPI *spi;
ASSERT(spi_num == 1 || spi_num == 2);
@@ -121,8 +121,35 @@ void spi_tx(uint32 spi_num, uint8 data) {
spi->DR = data;
- while (!(spi->SR & SR_TXE) || (spi->SR & SR_BSY))
+ while (!(spi->SR & SR_TXE) ||
+ (spi->SR & SR_BSY))
;
+
+ return spi->DR;
+}
+
+uint8 spi_tx(uint32 spi_num, uint8 *buf, uint32 len) {
+ SPI *spi;
+ uint32 i = 0;
+ uint8 rc;
+
+ ASSERT(spi_num == 1 || spi_num == 2);
+ spi = (spi_num == 1) ? (SPI*)SPI1_BASE : (SPI*)SPI2_BASE;
+
+ if (!len) {
+ return 0;
+ }
+
+ while (i < len) {
+ spi->DR = buf[i];
+ while (!(spi->SR & SR_TXE) ||
+ (spi->SR & SR_BSY) ||
+ !(spi->SR & SR_RXNE))
+ ;
+ rc = spi->DR;
+ i++;
+ }
+ return rc;
}
static void spi_gpio_cfg(const spi_dev *dev) {
diff --git a/libmaple/spi.h b/libmaple/spi.h
index cde3b42..25c2c6b 100644
--- a/libmaple/spi.h
+++ b/libmaple/spi.h
@@ -96,7 +96,8 @@ void spi_init(uint32 spi_num,
uint32 prescale,
uint32 endian,
uint32 mode);
-void spi_tx(uint32 spi_num, uint8 data);
+uint8 spi_tx_byte(uint32 spi_num, uint8 data);
+uint8 spi_tx(uint32 spi_num, uint8 *buf, uint32 len);
static inline uint8 spi_rx(uint32 spi_num) {
SPI *spi;
diff --git a/wirish/comm/HardwareSPI.cpp b/wirish/comm/HardwareSPI.cpp
index e083ac1..3dfe10a 100644
--- a/wirish/comm/HardwareSPI.cpp
+++ b/wirish/comm/HardwareSPI.cpp
@@ -118,8 +118,12 @@ void HardwareSPI::begin(void) {
* @brief send a byte out the spi peripheral
* @param data byte to send
*/
-void HardwareSPI::send(uint8 data) {
- spi_tx(this->spi_num, data);
+uint8 HardwareSPI::send(uint8 data) {
+ return spi_tx_byte(this->spi_num, data);
+}
+
+uint8 HardwareSPI::send(uint8 *buf, uint32 len) {
+ return spi_tx(this->spi_num, buf, len);
}
diff --git a/wirish/comm/HardwareSPI.h b/wirish/comm/HardwareSPI.h
index b974334..e606c0c 100644
--- a/wirish/comm/HardwareSPI.h
+++ b/wirish/comm/HardwareSPI.h
@@ -49,7 +49,8 @@ class HardwareSPI {
HardwareSPI(uint32 spi_num);
void begin(void);
void begin(SPIFrequency freq, uint32 endianness, uint32 mode);
- void send(uint8 data);
+ uint8 send(uint8 data);
+ uint8 send(uint8 *data, uint32 length);
uint8 recv(void);
};