diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-05-26 07:48:42 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-05-26 07:48:42 +0000 |
| commit | 6463abed02dc11e38816b53a5495be80a9f121c6 (patch) | |
| tree | fd980b79a00493f374f676875ee9139a87a83e86 | |
| parent | 1a88c5a6efeae9688a388574fbd97955d733abfc (diff) | |
| download | ChibiOS-6463abed02dc11e38816b53a5495be80a9f121c6.tar.gz ChibiOS-6463abed02dc11e38816b53a5495be80a9f121c6.tar.bz2 ChibiOS-6463abed02dc11e38816b53a5495be80a9f121c6.zip | |
Fixed bug #948.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12045 110e8d01-0319-4d1e-a829-52ad28d1bb01
| -rw-r--r-- | os/hal/ports/STM32/LLD/GPIOv3/hal_pal_lld.c | 1 | ||||
| -rw-r--r-- | os/hal/ports/STM32/STM32L4xx/platform_l432.mk | 2 | ||||
| -rw-r--r-- | readme.txt | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/os/hal/ports/STM32/LLD/GPIOv3/hal_pal_lld.c b/os/hal/ports/STM32/LLD/GPIOv3/hal_pal_lld.c index c2dcf7bc9..e1f63d3fd 100644 --- a/os/hal/ports/STM32/LLD/GPIOv3/hal_pal_lld.c +++ b/os/hal/ports/STM32/LLD/GPIOv3/hal_pal_lld.c @@ -141,6 +141,7 @@ void _pal_lld_setgroupmode(ioportid_t port, if (!mask)
return;
otyper <<= 1;
+ ascr <<= 1;
ospeedr <<= 2;
pupdr <<= 2;
moder <<= 2;
diff --git a/os/hal/ports/STM32/STM32L4xx/platform_l432.mk b/os/hal/ports/STM32/STM32L4xx/platform_l432.mk index 3daf14f89..3f838c7c1 100644 --- a/os/hal/ports/STM32/STM32L4xx/platform_l432.mk +++ b/os/hal/ports/STM32/STM32L4xx/platform_l432.mk @@ -25,7 +25,7 @@ include $(CHIBIOS)/os/hal/ports/STM32/LLD/ADCv3/driver.mk include $(CHIBIOS)/os/hal/ports/STM32/LLD/CANv1/driver.mk
include $(CHIBIOS)/os/hal/ports/STM32/LLD/DACv1/driver.mk
include $(CHIBIOS)/os/hal/ports/STM32/LLD/DMAv1/driver.mk
-include $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv3/driver.mk
+include $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv2/driver.mk
include $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv2/driver.mk
include $(CHIBIOS)/os/hal/ports/STM32/LLD/QUADSPIv1/driver.mk
include $(CHIBIOS)/os/hal/ports/STM32/LLD/RTCv2/driver.mk
diff --git a/readme.txt b/readme.txt index f8708db89..c26395455 100644 --- a/readme.txt +++ b/readme.txt @@ -126,6 +126,8 @@ - EX: Updated LIS302DL to 1.1.0 (backported to 18.2.1).
- EX: Updated LPS25H to 1.1.0 (backported to 18.2.1).
- EX: Updated LSM303DLHC to 1.1.0 (backported to 18.2.1).
+- HAL: Fixed ASCR register invalid handling in STM32 GPIOv3 driver (bug #948)
+ (backported to 18.2.2 and 17.6.5).
- HAL: Fixed missing definition in UART driver (bug #948)(backported
to 18.2.2).
- OTH: Fixed wrong macro check in GCC Cortex-M startup files (bug #947)
|