diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-01-10 08:12:50 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-01-10 08:12:50 +0000 |
| commit | 3310b12b3be4483babf13bc95a35e5d3000c1daf (patch) | |
| tree | b6406cef41ca1ab19ef982ab9d9f934a1bbc53ca /os/hal/ports/STM32 | |
| parent | 14b747019236d1417d3ef9bc885ec777dc26d35f (diff) | |
| download | ChibiOS-3310b12b3be4483babf13bc95a35e5d3000c1daf.tar.gz ChibiOS-3310b12b3be4483babf13bc95a35e5d3000c1daf.tar.bz2 ChibiOS-3310b12b3be4483babf13bc95a35e5d3000c1daf.zip | |
Polled exchange added to SPIv3.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11244 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/ports/STM32')
| -rw-r--r-- | os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.c | 52 | ||||
| -rw-r--r-- | os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.h | 2 |
2 files changed, 32 insertions, 22 deletions
diff --git a/os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.c b/os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.c index 855b931cd..175a22cf3 100644 --- a/os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.c +++ b/os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.c @@ -1076,33 +1076,43 @@ void spi_lld_abort(SPIDriver *spip) { * @param[in] frame the data frame to send over the SPI bus
* @return The received data frame from the SPI bus.
*/
-uint16_t spi_lld_polled_exchange(SPIDriver *spip, uint16_t frame) {
-#if 0
- /*
- * Data register must be accessed with the appropriate data size.
- * Byte size access (uint8_t *) for transactions that are <= 8-bit.
- * Halfword size access (uint16_t) for transactions that are <= 8-bit.
- */
- if ((spip->config->cr2 & SPI_CR2_DS) <= (SPI_CR2_DS_2 |
- SPI_CR2_DS_1 |
- SPI_CR2_DS_0)) {
- volatile uint8_t *spidr = (volatile uint8_t *)&spip->spi->RXDR;
- *spidr = (uint8_t)frame;
- while ((spip->spi->SR & SPI_SR_RXNE) == 0)
+uint32_t spi_lld_polled_exchange(SPIDriver *spip, uint32_t frame) {
+ uint32_t dsize = (spip->spi->CFG1 & SPI_CFG1_DSIZE_Msk) + 1U;
+ uint32_t rxframe;
+
+ spip->spi->CR1 |= SPI_CR1_CSTART;
+
+ /* Data register must be accessed with the appropriate data size.
+ Byte size access (uint8_t *) for transactions that are <= 8-bit etc.*/
+ if (dsize <= 8U) {
+ /* Frame width is between 4 and 8 bits.*/
+ volatile uint8_t *txdrp8 = (volatile uint8_t *)&spip->spi->TXDR;
+ volatile uint8_t *rxdrp8 = (volatile uint8_t *)&spip->spi->RXDR;
+ *txdrp8 = (uint8_t)frame;
+ while ((spip->spi->SR & SPI_SR_RXP) == 0U)
;
- return (uint16_t)*spidr;
+ rxframe = (uint32_t)*rxdrp8;
+ }
+ else if (dsize <= 16U) {
+ /* Frame width is between 9 and 16 bits.*/
+ volatile uint16_t *txdrp16 = (volatile uint16_t *)&spip->spi->TXDR;
+ volatile uint16_t *rxdrp16 = (volatile uint16_t *)&spip->spi->RXDR;
+ *txdrp16 = (uint16_t)frame;
+ while ((spip->spi->SR & SPI_SR_RXP) == 0U)
+ ;
+ rxframe = (uint32_t)*rxdrp16;
}
else {
+ /* Frame width is between 16 and 32 bits.*/
spip->spi->TXDR = frame;
- while ((spip->spi->SR & SPI_SR_RXNE) == 0)
+ while ((spip->spi->SR & SPI_SR_RXP) == 0U)
;
- return spip->spi->DR;
+ rxframe = spip->spi->RXDR;
}
-#else
- (void)spip;
- (void)frame;
- return 0;
-#endif
+
+ spip->spi->CR1 |= SPI_CR1_CSUSP;
+
+ return rxframe;
}
#endif /* HAL_USE_SPI */
diff --git a/os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.h b/os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.h index 052a2c58c..742631e43 100644 --- a/os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.h +++ b/os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.h @@ -694,7 +694,7 @@ extern "C" { void spi_lld_send(SPIDriver *spip, size_t n, const void *txbuf);
void spi_lld_receive(SPIDriver *spip, size_t n, void *rxbuf);
void spi_lld_abort(SPIDriver *spip);
- uint16_t spi_lld_polled_exchange(SPIDriver *spip, uint16_t frame);
+ uint32_t spi_lld_polled_exchange(SPIDriver *spip, uint32_t frame);
#ifdef __cplusplus
}
#endif
|