andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4131 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
gdisirio 2012-04-23 18:55:36 +00:00
parent 226d140bb9
commit 86153d2f0a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
os/hal/platforms/STM32/ext_lld.c
View File

@ -577,11 +577,11 @@ void ext_lld_channel_enable(EXTDriver *extp, expchannel_t channel) {
/* Setting the associated GPIO for external channels.*/ /* Setting the associated GPIO for external channels.*/
if (channel < 16) { if (channel < 16) {
uint32_t n = channel & 3; uint32_t n = channel >> 2;
uint32_t mask = 0xF << (channel >> 2); uint32_t mask = ~(0xF << (channel & 3));
uint32_t port = ((extp->config->channels[channel].mode & uint32_t port = ((extp->config->channels[channel].mode &
EXT_MODE_GPIO_MASK) >> EXT_MODE_GPIO_MASK) >>
EXT_MODE_GPIO_OFF) << (channel >> 2); EXT_MODE_GPIO_OFF) << (channel & 3);
#if defined(STM32L1XX_MD) || defined(STM32F2XX) || defined(STM32F4XX) #if defined(STM32L1XX_MD) || defined(STM32F2XX) || defined(STM32F4XX)
SYSCFG->EXTICR[n] = (SYSCFG->EXTICR[n] & mask) | port; SYSCFG->EXTICR[n] = (SYSCFG->EXTICR[n] & mask) | port;

2
todo.txt
View File

@ -8,7 +8,6 @@ N = Decided against.
Version 2.4.1 Version 2.4.1
* MAC driver for STM32F107, STM32F2xx, STM32F4xx. * MAC driver for STM32F107, STM32F2xx, STM32F4xx.
* SDC driver port to STM32F2 and STM32F4. * SDC driver port to STM32F2 and STM32F4.
* FatFs 0.9x integration.
X STM32F2 validation (so far testing done on STM32F4 only). X STM32F2 validation (so far testing done on STM32F4 only).
X Revision of the RTCv2 driver implementation. X Revision of the RTCv2 driver implementation.
- CAN2 support and CAN driver test on STM32F2/F4. - 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. * Handling of Virtual Timer callbacks out of critical zone.
* Add normal API (not iclass) variants of the VT functions. * Add normal API (not iclass) variants of the VT functions.
* MMC_SPI driver speedup. * MMC_SPI driver speedup.
* FatFs 0.9x integration.
- USB driver model revision. - USB driver model revision.
X STM32 OTG USB cell support for CL, F2, F4 devices. X STM32 OTG USB cell support for CL, F2, F4 devices.
- Add USARTs support to the STM32 SPI driver. - Add USARTs support to the STM32 SPI driver.