diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-02-06 12:35:45 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-02-06 12:35:45 +0000 |
| commit | 22bb52a091a2e8d5521418b07c26c5608eb62f30 (patch) | |
| tree | a1fd9dac056c6f2bd93c9fd46a894ae5c819d1de /os/hal/ports/STM32/LLD/GPIOv2 | |
| parent | 33c0aa4fa5e0e78c04a67e7595d2aaf840cc6c3c (diff) | |
| download | ChibiOS-22bb52a091a2e8d5521418b07c26c5608eb62f30.tar.gz ChibiOS-22bb52a091a2e8d5521418b07c26c5608eb62f30.tar.bz2 ChibiOS-22bb52a091a2e8d5521418b07c26c5608eb62f30.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8853 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/ports/STM32/LLD/GPIOv2')
| -rw-r--r-- | os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c | 2 | ||||
| -rw-r--r-- | os/hal/ports/STM32/LLD/GPIOv2/pal_lld.h | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c b/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c index 40f9e4dfc..10fc1a72b 100644 --- a/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c +++ b/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.c @@ -163,7 +163,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 bit = 0;
while (true) {
diff --git a/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.h b/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.h index d813ecc7c..9012e1ad3 100644 --- a/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.h +++ b/os/hal/ports/STM32/LLD/GPIOv2/pal_lld.h @@ -64,10 +64,10 @@ #endif
#define PAL_STM32_OSPEED_HIGHEST (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)
@@ -104,13 +104,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.
|