andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SPI driver works, probably optimizations are possible. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11226 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio 2018-01-05 10:08:52 +00:00
parent 58613c9052
commit dff9e16285
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
os/hal/ports/STM32/LLD/DMAv2/stm32_dma.h
View File

@ -138,6 +138,7 @@
#define STM32_DMA_CR_TEIE DMA_SxCR_TEIE #define STM32_DMA_CR_TEIE DMA_SxCR_TEIE
#define STM32_DMA_CR_HTIE DMA_SxCR_HTIE #define STM32_DMA_CR_HTIE DMA_SxCR_HTIE
#define STM32_DMA_CR_TCIE DMA_SxCR_TCIE #define STM32_DMA_CR_TCIE DMA_SxCR_TCIE
#define STM32_DMA_CR_PFCTRL DMA_SxCR_PFCTRL
#define STM32_DMA_CR_DIR_MASK DMA_SxCR_DIR #define STM32_DMA_CR_DIR_MASK DMA_SxCR_DIR
#define STM32_DMA_CR_DIR_P2M 0 #define STM32_DMA_CR_DIR_P2M 0
#define STM32_DMA_CR_DIR_M2P DMA_SxCR_DIR_0 #define STM32_DMA_CR_DIR_M2P DMA_SxCR_DIR_0

10
os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.c
View File

@ -15,7 +15,7 @@
*/ */
/** /**
* @file SPIv2/hal_spi_lld.c * @file SPIv3/hal_spi_lld.c
* @brief STM32 SPI subsystem low level driver source. * @brief STM32 SPI subsystem low level driver source.
* *
* @addtogroup SPI * @addtogroup SPI
@ -523,7 +523,7 @@ void spi_lld_start(SPIDriver *spip) {
} }
/* Configuration-specific DMA setup.*/ /* Configuration-specific DMA setup.*/
dsize = (spip->config->cfg2 & SPI_CFG1_DSIZE_Msk) + 1U; dsize = (spip->config->cfg1 & SPI_CFG1_DSIZE_Msk) + 1U;
cfg1 = spip->config->cfg1 | SPI_CFG1_RXDMAEN | SPI_CFG1_TXDMAEN; cfg1 = spip->config->cfg1 | SPI_CFG1_RXDMAEN | SPI_CFG1_TXDMAEN;
cfg1 &= ~SPI_CFG1_FTHLV_Msk; cfg1 &= ~SPI_CFG1_FTHLV_Msk;
if (dsize <= 8U) { if (dsize <= 8U) {
@ -532,7 +532,7 @@ void spi_lld_start(SPIDriver *spip) {
STM32_DMA_CR_PSIZE_BYTE | STM32_DMA_CR_MSIZE_BYTE; STM32_DMA_CR_PSIZE_BYTE | STM32_DMA_CR_MSIZE_BYTE;
spip->txdmamode = (spip->txdmamode & ~STM32_DMA_CR_SIZE_MASK) | spip->txdmamode = (spip->txdmamode & ~STM32_DMA_CR_SIZE_MASK) |
STM32_DMA_CR_PSIZE_BYTE | STM32_DMA_CR_MSIZE_BYTE; STM32_DMA_CR_PSIZE_BYTE | STM32_DMA_CR_MSIZE_BYTE;
cfg1 |= SPI_CFG1_FTHLV_2; /* FTHLV = 4.*/ cfg1 |= SPI_CFG1_FTHLV_VALUE(0);
} }
else if (dsize <= 16U) { else if (dsize <= 16U) {
/* Frame width is between 9 and 16 bits.*/ /* Frame width is between 9 and 16 bits.*/
@ -540,7 +540,7 @@ void spi_lld_start(SPIDriver *spip) {
STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD; STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD;
spip->txdmamode = (spip->txdmamode & ~STM32_DMA_CR_SIZE_MASK) | spip->txdmamode = (spip->txdmamode & ~STM32_DMA_CR_SIZE_MASK) |
STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD; STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD;
cfg1 |= SPI_CFG1_FTHLV_1; /* FTHLV = 2.*/ cfg1 |= SPI_CFG1_FTHLV_VALUE(0);
} }
else { else {
/* Frame width is between 16 and 32 bits.*/ /* Frame width is between 16 and 32 bits.*/
@ -548,7 +548,7 @@ void spi_lld_start(SPIDriver *spip) {
STM32_DMA_CR_PSIZE_WORD | STM32_DMA_CR_MSIZE_WORD; STM32_DMA_CR_PSIZE_WORD | STM32_DMA_CR_MSIZE_WORD;
spip->txdmamode = (spip->txdmamode & ~STM32_DMA_CR_SIZE_MASK) | spip->txdmamode = (spip->txdmamode & ~STM32_DMA_CR_SIZE_MASK) |
STM32_DMA_CR_PSIZE_WORD | STM32_DMA_CR_MSIZE_WORD; STM32_DMA_CR_PSIZE_WORD | STM32_DMA_CR_MSIZE_WORD;
cfg1 |= SPI_CFG1_FTHLV_0; /* FTHLV = 1.*/ cfg1 |= SPI_CFG1_FTHLV_VALUE(0);
} }
/* SPI setup and enable.*/ /* SPI setup and enable.*/

2
os/hal/ports/STM32/LLD/SPIv3/hal_spi_lld.h
View File

@ -15,7 +15,7 @@
*/ */
/** /**
* @file SPIv2/hal_spi_lld.h * @file SPIv3/hal_spi_lld.h
* @brief STM32 SPI subsystem low level driver header. * @brief STM32 SPI subsystem low level driver header.
* *
* @addtogroup SPI * @addtogroup SPI

5
testhal/STM32/multi/SPI/main.c
View File

@ -41,6 +41,8 @@ static THD_FUNCTION(spi_thread_1, p) {
spiExchange(&PORTAB_SPI1, 512, spiExchange(&PORTAB_SPI1, 512,
txbuf, rxbuf); /* Atomic transfer operations. */ txbuf, rxbuf); /* Atomic transfer operations. */
spiUnselect(&PORTAB_SPI1); /* Slave Select de-assertion. */ spiUnselect(&PORTAB_SPI1); /* Slave Select de-assertion. */
dmaBufferInvalidate(&txbuf[0], /* Cache invalidation over the */
sizeof txbuf); /* buffer. */
spiReleaseBus(&PORTAB_SPI1); /* Ownership release. */ spiReleaseBus(&PORTAB_SPI1); /* Ownership release. */
} }
} }
@ -61,6 +63,8 @@ static THD_FUNCTION(spi_thread_2, p) {
spiExchange(&PORTAB_SPI1, 512, spiExchange(&PORTAB_SPI1, 512,
txbuf, rxbuf); /* Atomic transfer operations. */ txbuf, rxbuf); /* Atomic transfer operations. */
spiUnselect(&PORTAB_SPI1); /* Slave Select de-assertion. */ spiUnselect(&PORTAB_SPI1); /* Slave Select de-assertion. */
dmaBufferInvalidate(&txbuf[0], /* Cache invalidation over the */
sizeof txbuf); /* buffer. */
spiReleaseBus(&PORTAB_SPI1); /* Ownership release. */ spiReleaseBus(&PORTAB_SPI1); /* Ownership release. */
} }
} }
@ -107,6 +111,7 @@ int main(void) {
*/ */
for (i = 0; i < sizeof(txbuf); i++) for (i = 0; i < sizeof(txbuf); i++)
txbuf[i] = (uint8_t)i; txbuf[i] = (uint8_t)i;
dmaBufferFlush(&txbuf[0], sizeof txbuf);
/* /*
* Starting the transmitter and receiver threads. * Starting the transmitter and receiver threads.