diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-10-03 16:28:53 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-10-03 16:28:53 +0000 |
| commit | 6b02656019eec83657fad94d4e685ff516e471ae (patch) | |
| tree | edbb1108d11a9c6a879014312a57bee1e15a2576 /nuttx/arch/arm/src/stm32/stm32_lowputc.c | |
| parent | 0a9e07be6c7ad1d114b55efbde66eb6e9952fc49 (diff) | |
| download | px4-nuttx-6b02656019eec83657fad94d4e685ff516e471ae.tar.gz px4-nuttx-6b02656019eec83657fad94d4e685ff516e471ae.tar.bz2 px4-nuttx-6b02656019eec83657fad94d4e685ff516e471ae.zip | |
Fix GPIO alternate pin name space issue
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2117 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/stm32/stm32_lowputc.c')
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_lowputc.c | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_lowputc.c b/nuttx/arch/arm/src/stm32/stm32_lowputc.c index b3c54d1b3..0f649bbd7 100644 --- a/nuttx/arch/arm/src/stm32/stm32_lowputc.c +++ b/nuttx/arch/arm/src/stm32/stm32_lowputc.c @@ -246,17 +246,13 @@ void stm32_lowsetup(void) #ifdef CONFIG_STM32_USART1_REMAP mapr |= AFIO_MAPR_USART1_REMAP; - putreg32(mapr, STM32_AFIO_MAPR); - - stm32_configgpio(GPIO_USART1_RMTX); - stm32_configgpio(GPIO_USART1_RMRX); #else mapr &= ~AFIO_MAPR_USART1_REMAP; +#endif putreg32(mapr, STM32_AFIO_MAPR); stm32_configgpio(GPIO_USART1_TX); stm32_configgpio(GPIO_USART1_RX); -#endif #endif /* CONFIG_STM32_USART1 */ #ifdef CONFIG_STM32_USART2 @@ -274,17 +270,13 @@ void stm32_lowsetup(void) #ifdef CONFIG_STM32_USART2_REMAP mapr |= ~AFIO_MAPR_USART2_REMAP; - putreg32(mapr, STM32_AFIO_MAPR); - - stm32_configgpio(GPIO_USART2_RMTX); - stm32_configgpio(GPIO_USART2_RMRX); #else mapr &= ~AFIO_MAPR_USART2_REMAP; +#endif putreg32(mapr, STM32_AFIO_MAPR); stm32_configgpio(GPIO_USART2_TX); stm32_configgpio(GPIO_USART2_RX); -#endif #endif /* CONFIG_STM32_USART2 */ #ifdef CONFIG_STM32_USART3 @@ -301,24 +293,15 @@ void stm32_lowsetup(void) */ mapr &= ~AFIO_MAPR_USART3_REMAP_MASK; -#if defined(CONFIG_STM32_USART2_PARTIAL_REMAP) +#if defined(CONFIG_STM32_USART3_PARTIAL_REMAP) mapr |= AFIO_MAPR_USART3_PARTREMAP; - putreg32(mapr, STM32_AFIO_MAPR); - - stm32_configgpio(GPIO_USART3_PRMTX); - stm32_configgpio(GPIO_USART3_PRMRX); -#elif defined(CONFIG_STM32_USART2_FULL_REMAP) +#elif defined(CONFIG_STM32_USART3_FULL_REMAP) mapr |= AFIO_MAPR_USART3_FULLREMAP; - putreg32(mapr, STM32_AFIO_MAPR); - - stm32_configgpio(GPIO_USART3_FRMTX); - stm32_configgpio(GPIO_USART3_FRMRX); -#else +#endif putreg32(mapr, STM32_AFIO_MAPR); stm32_configgpio(GPIO_USART3_TX); stm32_configgpio(GPIO_USART3_RX); -#endif #endif /* CONFIG_STM32_USART3 */ /* Enable and configure the selected console device */ |