From 22bb52a091a2e8d5521418b07c26c5608eb62f30 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 6 Feb 2016 12:35:45 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8853 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/ports/STM32/LLD/GPIOv3/pal_lld.c | 2 +- os/hal/ports/STM32/LLD/GPIOv3/pal_lld.h | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'os/hal/ports/STM32/LLD/GPIOv3') diff --git a/os/hal/ports/STM32/LLD/GPIOv3/pal_lld.c b/os/hal/ports/STM32/LLD/GPIOv3/pal_lld.c index 3abf97503..5f96bb785 100644 --- a/os/hal/ports/STM32/LLD/GPIOv3/pal_lld.c +++ b/os/hal/ports/STM32/LLD/GPIOv3/pal_lld.c @@ -146,7 +146,7 @@ void _pal_lld_setgroupmode(ioportid_t port, uint32_t moder = (mode & PAL_STM32_MODE_MASK) >> 0; uint32_t otyper = (mode & PAL_STM32_OTYPE_MASK) >> 2; uint32_t ospeedr = (mode & PAL_STM32_OSPEED_MASK) >> 3; - uint32_t pupdr = (mode & PAL_STM32_PUDR_MASK) >> 5; + uint32_t pupdr = (mode & PAL_STM32_PUPDR_MASK) >> 5; uint32_t altr = (mode & PAL_STM32_ALTERNATE_MASK) >> 7; uint32_t ascr = (mode & PAL_STM32_ASCR_MASK) >> 11; uint32_t lockr = (mode & PAL_STM32_LOCKR_MASK) >> 12; diff --git a/os/hal/ports/STM32/LLD/GPIOv3/pal_lld.h b/os/hal/ports/STM32/LLD/GPIOv3/pal_lld.h index 0c4fa80d0..2fa297076 100644 --- a/os/hal/ports/STM32/LLD/GPIOv3/pal_lld.h +++ b/os/hal/ports/STM32/LLD/GPIOv3/pal_lld.h @@ -60,10 +60,10 @@ #define PAL_STM32_OSPEED_FAST (2U << 3U) #define PAL_STM32_OSPEED_HIGH (3U << 3U) -#define PAL_STM32_PUDR_MASK (3U << 5U) -#define PAL_STM32_PUDR_FLOATING (0U << 5U) -#define PAL_STM32_PUDR_PULLUP (1U << 5U) -#define PAL_STM32_PUDR_PULLDOWN (2U << 5U) +#define PAL_STM32_PUPDR_MASK (3U << 5U) +#define PAL_STM32_PUPDR_FLOATING (0U << 5U) +#define PAL_STM32_PUPDR_PULLUP (1U << 5U) +#define PAL_STM32_PUPDR_PULLDOWN (2U << 5U) #define PAL_STM32_ALTERNATE_MASK (15U << 7U) #define PAL_STM32_ALTERNATE(n) ((n) << 7U) @@ -110,13 +110,13 @@ * @brief Input pad with weak pull up resistor. */ #define PAL_MODE_INPUT_PULLUP (PAL_STM32_MODE_INPUT | \ - PAL_STM32_PUDR_PULLUP) + PAL_STM32_PUPDR_PULLUP) /** * @brief Input pad with weak pull down resistor. */ #define PAL_MODE_INPUT_PULLDOWN (PAL_STM32_MODE_INPUT | \ - PAL_STM32_PUDR_PULLDOWN) + PAL_STM32_PUPDR_PULLDOWN) /** * @brief Analog input mode. -- cgit v1.2.3