From 86153d2f0a10355bc03c69b083fa3045c45a3da0 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Mon, 23 Apr 2012 18:55:36 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4131 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/platforms/STM32/ext_lld.c | 6 +++--- todo.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/os/hal/platforms/STM32/ext_lld.c b/os/hal/platforms/STM32/ext_lld.c index 4a3cd3c2e..ed80f524c 100644 --- a/os/hal/platforms/STM32/ext_lld.c +++ b/os/hal/platforms/STM32/ext_lld.c @@ -577,11 +577,11 @@ void ext_lld_channel_enable(EXTDriver *extp, expchannel_t channel) { /* Setting the associated GPIO for external channels.*/ if (channel < 16) { - uint32_t n = channel & 3; - uint32_t mask = 0xF << (channel >> 2); + uint32_t n = channel >> 2; + uint32_t mask = ~(0xF << (channel & 3)); uint32_t port = ((extp->config->channels[channel].mode & EXT_MODE_GPIO_MASK) >> - EXT_MODE_GPIO_OFF) << (channel >> 2); + EXT_MODE_GPIO_OFF) << (channel & 3); #if defined(STM32L1XX_MD) || defined(STM32F2XX) || defined(STM32F4XX) SYSCFG->EXTICR[n] = (SYSCFG->EXTICR[n] & mask) | port; diff --git a/todo.txt b/todo.txt index 12a00c54f..b92785a07 100644 --- a/todo.txt +++ b/todo.txt @@ -8,7 +8,6 @@ N = Decided against. Version 2.4.1 * MAC driver for STM32F107, STM32F2xx, STM32F4xx. * SDC driver port to STM32F2 and STM32F4. -* FatFs 0.9x integration. X STM32F2 validation (so far testing done on STM32F4 only). X Revision of the RTCv2 driver implementation. - CAN2 support and CAN driver test on STM32F2/F4. @@ -18,6 +17,7 @@ Within 2.5.x: * Handling of Virtual Timer callbacks out of critical zone. * Add normal API (not iclass) variants of the VT functions. * MMC_SPI driver speedup. +* FatFs 0.9x integration. - USB driver model revision. X STM32 OTG USB cell support for CL, F2, F4 devices. - Add USARTs support to the STM32 SPI driver. -- cgit v1.2.3