rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

Fix up SPI DMA streams

Browse Source
This commit is contained in:
James Cotton 2011-08-13 04:54:19 -05:00
parent 8929e2f359
commit e1f7a5003d
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flight/INS/pios_board.c
View File

@ -42,8 +42,8 @@
* .rodata section (ie. Flash) rather than in the .bss section (RAM).
*/
void PIOS_SPI_op_irq_handler(void);
void DMA1_Stream0_IRQ_Handler(void) __attribute__((alias("PIOS_SPI_op_irq_handler")));
void DMA1_Stream5_IRQ_Handler(void) __attribute__((alias("PIOS_SPI_op_irq_handler")));
void DMA1_Stream3_IRQ_Handler(void) __attribute__((alias("PIOS_SPI_op_irq_handler")));
void DMA1_Stream4_IRQ_Handler(void) __attribute__((alias("PIOS_SPI_op_irq_handler")));
static const struct pios_spi_cfg pios_spi_op_cfg = {
.regs = SPI2,
.init = {
@ -71,8 +71,9 @@ static const struct pios_spi_cfg pios_spi_op_cfg = {
},
.rx = {
.channel = DMA1_Stream0,
.channel = DMA1_Stream3,
.init = {
.DMA_Channel = DMA_Channel_0,
.DMA_PeripheralBaseAddr = (uint32_t) & (SPI2->DR),
.DMA_DIR = DMA_DIR_PeripheralToMemory,
.DMA_PeripheralInc = DMA_PeripheralInc_Disable,
@ -89,8 +90,9 @@ static const struct pios_spi_cfg pios_spi_op_cfg = {
},
},
.tx = {
.channel = DMA1_Stream5,
.channel = DMA1_Stream4,
.init = {
.DMA_Channel = DMA_Channel_0,
.DMA_PeripheralBaseAddr = (uint32_t) & (SPI2->DR),
.DMA_DIR = DMA_DIR_MemoryToPeripheral,
.DMA_PeripheralInc = DMA_PeripheralInc_Disable,
@ -206,7 +208,7 @@ static const struct pios_spi_cfg pios_spi_accel_cfg = {
},
},
.tx = {
.channel = DMA1_Stream3,
.channel = DMA2_Stream3,
.init = {
.DMA_Channel = DMA_Channel_3,
.DMA_PeripheralBaseAddr = (uint32_t)&(SPI1->DR),

2
flight/PiOS/STM32F2xx/pios_imu3000.c
View File

@ -268,7 +268,7 @@ static int32_t PIOS_IMU3000_Write(uint8_t address, uint8_t buffer)
/**
* @brief Run self-test operation.
* \return 0 if test failed
* \return 0 if test succeeded
* \return non-zero value if test succeeded
*/
uint8_t PIOS_IMU3000_Test(void)