From 43387d1794451f0472ae0b665bb863f68ac7996f Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 8 Jun 2016 19:43:36 +0200 Subject: [PATCH] Simu SEGFAULT --- radio/src/targets/simu/simpgmspace.cpp | 2 +- radio/src/targets/simu/simpgmspace.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/radio/src/targets/simu/simpgmspace.cpp b/radio/src/targets/simu/simpgmspace.cpp index 7770418b3..799f97fbf 100644 --- a/radio/src/targets/simu/simpgmspace.cpp +++ b/radio/src/targets/simu/simpgmspace.cpp @@ -57,7 +57,7 @@ uint32_t Peri1_frequency, Peri2_frequency; GPIO_TypeDef gpioa, gpiob, gpioc, gpiod, gpioe, gpiof, gpiog, gpioh, gpioi, gpioj; TIM_TypeDef tim1, tim2, tim3, tim4, tim5, tim6, tim7, tim8, tim9, tim10; RCC_TypeDef rcc; -DMA_Stream_TypeDef dma1_stream5, dma1_stream7, dma2_stream1, dma2_stream2, dma2_stream5, dma2_stream6; +DMA_Stream_TypeDef dma1_stream2, dma1_stream5, dma1_stream7, dma2_stream1, dma2_stream2, dma2_stream5, dma2_stream6; DMA_TypeDef dma2; USART_TypeDef Usart0, Usart1, Usart2, Usart3, Usart4; #elif defined(CPUARM) diff --git a/radio/src/targets/simu/simpgmspace.h b/radio/src/targets/simu/simpgmspace.h index b6f49d241..d4465f556 100644 --- a/radio/src/targets/simu/simpgmspace.h +++ b/radio/src/targets/simu/simpgmspace.h @@ -93,7 +93,7 @@ extern GPIO_TypeDef gpioa, gpiob, gpioc, gpiod, gpioe, gpiof, gpiog, gpioh, gpio extern TIM_TypeDef tim1, tim2, tim3, tim4, tim5, tim6, tim7, tim8, tim9, tim10; extern USART_TypeDef Usart0, Usart1, Usart2, Usart3, Usart4; extern RCC_TypeDef rcc; -extern DMA_Stream_TypeDef dma1_stream5, dma1_stream7, dma2_stream1, dma2_stream2, dma2_stream5, dma2_stream6; +extern DMA_Stream_TypeDef dma1_stream2, dma1_stream5, dma1_stream7, dma2_stream1, dma2_stream2, dma2_stream5, dma2_stream6; extern DMA_TypeDef dma2; #undef GPIOA #undef GPIOB @@ -145,12 +145,14 @@ extern DMA_TypeDef dma2; #define USART3 (&Usart3) #undef RCC #define RCC (&rcc) +#undef DMA1_Stream2 #undef DMA1_Stream5 #undef DMA1_Stream7 #undef DMA2_Stream1 #undef DMA2_Stream2 #undef DMA2_Stream5 #undef DMA2_Stream6 +#define DMA1_Stream2 (&dma1_stream2) #define DMA1_Stream5 (&dma1_stream5) #define DMA1_Stream7 (&dma1_stream7) #define DMA2_Stream1 (&dma2_stream1)