git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6792 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
gdisirio 2014-03-19 15:13:11 +00:00
parent 7e778da6b0
commit 824a2d427a
2 changed files with 17 additions and 16 deletions

View File

@ -120,6 +120,21 @@ void ext_lld_stop(EXTDriver *extp) {
*/ */
void ext_lld_channel_enable(EXTDriver *extp, expchannel_t channel) { void ext_lld_channel_enable(EXTDriver *extp, expchannel_t channel) {
/* Setting the associated GPIO for external channels.*/
if (channel < 16) {
uint32_t n = channel >> 2;
uint32_t mask = ~(0xF << ((channel & 3) * 4));
uint32_t port = ((extp->config->channels[channel].mode &
EXT_MODE_GPIO_MASK) >>
EXT_MODE_GPIO_OFF) << ((channel & 3) * 4);
#if defined(STM32F1XX)
AFIO->EXTICR[n] = (AFIO->EXTICR[n] & mask) | port;
#else /* !defined(STM32F1XX) */
SYSCFG->EXTICR[n] = (SYSCFG->EXTICR[n] & mask) | port;
#endif /* !defined(STM32F1XX) */
}
#if STM32_EXTI_NUM_CHANNELS > 32 #if STM32_EXTI_NUM_CHANNELS > 32
if (channel < 32) { if (channel < 32) {
#endif #endif
@ -166,22 +181,6 @@ void ext_lld_channel_enable(EXTDriver *extp, expchannel_t channel) {
} }
} }
#endif #endif
/* Setting the associated GPIO for external channels.*/
if (channel < 16) {
uint32_t n = channel >> 2;
uint32_t mask = ~(0xF << ((channel & 3) * 4));
uint32_t port = ((extp->config->channels[channel].mode &
EXT_MODE_GPIO_MASK) >>
EXT_MODE_GPIO_OFF) << ((channel & 3) * 4);
#if defined(STM32L1XX_MD) || defined(STM32F0XX) || defined(STM32F2XX) || \
defined(STM32F30X) || defined(STM32F37X) || defined(STM32F4XX)
SYSCFG->EXTICR[n] = (SYSCFG->EXTICR[n] & mask) | port;
#else /* STM32F1XX */
AFIO->EXTICR[n] = (AFIO->EXTICR[n] & mask) | port;
#endif /* STM32F1XX */
}
} }
/** /**

View File

@ -89,6 +89,8 @@
***************************************************************************** *****************************************************************************
*** 2.7.0 *** *** 2.7.0 ***
- FIX: Fixed spurious callback in STM32 EXT driver (bug #477)(backported
to 2.6.4).
- FIX: Fixed several macro errors in STM32L1xx HAL driver (bug #476) - FIX: Fixed several macro errors in STM32L1xx HAL driver (bug #476)
(backported to 2.6.4). (backported to 2.6.4).
- FIX: Fixed wrong STM32 RTCv2 alarms implementation (bug #475)(backported - FIX: Fixed wrong STM32 RTCv2 alarms implementation (bug #475)(backported