summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2017-08-06 12:03:27 +0800
committerGitHub <[email protected]>2017-08-06 12:03:27 +0800
commit25d415a28c52533415f5cfaa0b0dfd4ba57f6b2d (patch)
tree3bf86ef79451b258ee42995298e1d4e6d4c11c5f
parent6a08e154eeebf9644273d4ff99274d3c50fb8251 (diff)
parent6eac07ca15da9a918919f8ab5800545386ad5bac (diff)
Merge pull request #790 from TanekLiang/stm32f1l07-c99
[Bsp] update stm32f107 spi driver
-rw-r--r--bsp/stm32f107/drivers/rt_stm32f10x_spi.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/bsp/stm32f107/drivers/rt_stm32f10x_spi.c b/bsp/stm32f107/drivers/rt_stm32f10x_spi.c
index 124c41945b..82a8c2cab3 100644
--- a/bsp/stm32f107/drivers/rt_stm32f10x_spi.c
+++ b/bsp/stm32f107/drivers/rt_stm32f10x_spi.c
@@ -144,7 +144,7 @@ void DMA1_Channel4_IRQHandler(void) {
/* enter interrupt */
rt_interrupt_enter();
rt_event_send(&dma2.event, SPI_DMA_TX_DONE);
- DMA_ClearFlag(dma2.tx_gl_flag);
+ DMA_ClearFlag(dma2.priv_data->tx_gl_flag);
/* leave interrupt */
rt_interrupt_leave();
}
@@ -418,9 +418,12 @@ rt_err_t stm32_spi_register(SPI_TypeDef * SPI,
const char * spi_bus_name)
{
rt_err_t res = RT_EOK;
+#ifdef SPI_USE_DMA
NVIC_InitTypeDef NVIC_InitStructure;
- RCC_APB2PeriphClockCmd(RCC_APB2Periph_AFIO, ENABLE);
+#endif
rt_uint32_t flags = 0;
+ RCC_APB2PeriphClockCmd(RCC_APB2Periph_AFIO, ENABLE);
+
if(SPI == SPI1)
{
stm32_spi->SPI = SPI1;