From 20fa15c24a66cd45bd397bcab94b89fff2c8ad3d Mon Sep 17 00:00:00 2001 From: stac Date: Fri, 18 Jun 2010 04:28:32 +0000 Subject: [PATCH] spi: fix block transfers SPI block transfers were broken in commit r759. Block transfers are primarily used by the SD card interface so this also broke accesses to the SD card. SD card accesses should be fixed now. Verified by writing config objects in the GCS and confirming that they survived a reboot of the OP board. git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@808 ebee16cc-31ac-478f-84a7-5cbb03baadba --- flight/PiOS/STM32F10x/pios_spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flight/PiOS/STM32F10x/pios_spi.c b/flight/PiOS/STM32F10x/pios_spi.c index 11e0989b4..4e7be5adb 100644 --- a/flight/PiOS/STM32F10x/pios_spi.c +++ b/flight/PiOS/STM32F10x/pios_spi.c @@ -330,7 +330,7 @@ int32_t PIOS_SPI_TransferBlock(uint8_t spi, uint8_t *send_buffer, uint8_t *recei dma_init.DMA_MemoryBaseAddr = (uint32_t)&spi_dev->rx_dummy_byte; dma_init.DMA_MemoryInc = DMA_MemoryInc_Disable; } - dma_init.DMA_MemoryDataSize = len; + dma_init.DMA_BufferSize = len; DMA_Init(spi_dev->cfg->dma.rx.channel, &(dma_init)); DMA_Cmd(spi_dev->cfg->dma.rx.channel, ENABLE); @@ -350,7 +350,7 @@ int32_t PIOS_SPI_TransferBlock(uint8_t spi, uint8_t *send_buffer, uint8_t *recei dma_init.DMA_MemoryBaseAddr = (uint32_t)&spi_dev->tx_dummy_byte; dma_init.DMA_MemoryInc = DMA_MemoryInc_Disable; } - dma_init.DMA_MemoryDataSize = len; + dma_init.DMA_BufferSize = len; DMA_Init(spi_dev->cfg->dma.tx.channel, &(dma_init)); /* Enable DMA interrupt if callback function active */