diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-09-29 18:56:20 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-09-29 18:56:20 +0000 |
| commit | 418843fa16f1b23b44175dfc2eddfacc20a7eff5 (patch) | |
| tree | afc8f42742c702cff0e55342ad5926336230650a /nuttx/arch/arm/src/stm32/stm32_gpio.h | |
| parent | 0438297bba6c3a96a9d5fe182775542b55b53178 (diff) | |
| download | px4-nuttx-418843fa16f1b23b44175dfc2eddfacc20a7eff5.tar.gz px4-nuttx-418843fa16f1b23b44175dfc2eddfacc20a7eff5.tar.bz2 px4-nuttx-418843fa16f1b23b44175dfc2eddfacc20a7eff5.zip | |
Fix PU/PD config; improve MODE/CNF setting
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2106 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/stm32/stm32_gpio.h')
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_gpio.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_gpio.h b/nuttx/arch/arm/src/stm32/stm32_gpio.h index 4e2c9f8ac..dc555b9ed 100644 --- a/nuttx/arch/arm/src/stm32/stm32_gpio.h +++ b/nuttx/arch/arm/src/stm32/stm32_gpio.h @@ -148,10 +148,13 @@ /* Port configuration register low */ -#define GPIO_CR_MODE_SHIFT(n) ((n) << 1) +#define GPIO_CR_MODE_SHIFT(n) ((n) << 2) #define GPIO_CR_MODE_MASK(n) (3 << GPIO_CR_MODE_SHIFT(n)) -#define GPIO_CRL_CNF_SHIFT(n) (2+((n) << 1)) -#define GPIO_CRL_CNF_MASK(n) (3 << GPIO_CRL_CNF_SHIFT(n)) +#define GPIO_CR_CNF_SHIFT(n) (2 + ((n) << 2)) +#define GPIO_CR_CNF_MASK(n) (3 << GPIO_CRL_CNF_SHIFT(n)) + +#define GPIO_CR_MODECNF_SHIFT(n) ((n) << 2) +#define GPIO_CR_MODECNF_MASK(n) (0x0f << GPIO_CR_MODECNF_SHIFT(n)) #define GPIO_CRL_MODE0_SHIFT (0) /* Bits 1:0: Port mode bits */ #define GPIO_CRL_MODE0_MASK (3 << GPIO_CRL_MODE0_SHIFT) |