diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-14 14:14:54 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-14 14:14:54 +0000 |
| commit | ee2220174467b0e456446f5faaef1bd1660f786e (patch) | |
| tree | 61937f54d7558e15f984b0450c2958e9ed45b5bd /nuttx/arch/arm/src/stm32/stm32_internal.h | |
| parent | 38121cceb67b2408c5aab1d3e9998accef0d83c8 (diff) | |
| download | px4-nuttx-ee2220174467b0e456446f5faaef1bd1660f786e.tar.gz px4-nuttx-ee2220174467b0e456446f5faaef1bd1660f786e.tar.bz2 px4-nuttx-ee2220174467b0e456446f5faaef1bd1660f786e.zip | |
VSN/apps update
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3378 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/stm32/stm32_internal.h')
| -rwxr-xr-x | nuttx/arch/arm/src/stm32/stm32_internal.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_internal.h b/nuttx/arch/arm/src/stm32/stm32_internal.h index f5094d50a..1af627a71 100755 --- a/nuttx/arch/arm/src/stm32/stm32_internal.h +++ b/nuttx/arch/arm/src/stm32/stm32_internal.h @@ -80,6 +80,16 @@ #define GPIO_OUTPUT (0) /* 0=Output or alternate function */ #define GPIO_ALT (0) +/* If the pin is a GPIO digital output, then this identifies the initial output value. + * If the pin is an input, this bit is overloaded to provide the qualifier to\ + * distinquish input pull-up and -down: + * + * .... .... V... .... + */ + +#define GPIO_OUTPUT_SET (1 << 7) /* Bit 7: If output, inital value of output */ +#define GPIO_OUTPUT_CLEAR (0) + /* These bits set the primary function of the pin: * .FF. .... .... .... */ @@ -89,8 +99,9 @@ # define GPIO_CNF_ANALOGIN (0 << GPIO_CNF_SHIFT) /* Analog input */ # define GPIO_CNF_INFLOAT (1 << GPIO_CNF_SHIFT) /* Input floating */ -# define GPIO_CNF_INPULLUP (2 << GPIO_CNF_SHIFT) /* Input pull-up */ -# define GPIO_CNF_INPULLDWN (3 << GPIO_CNF_SHIFT) /* Input pull-down */ +# define GPIO_CNF_INPULLUD (2 << GPIO_CNF_SHIFT) /* Input pull-up/down general bit, since up is composed of two parts */ +# define GPIO_CNF_INPULLDWN (2 << GPIO_CNF_SHIFT) /* Input pull-down */ +# define GPIO_CNF_INPULLUP ((2 << GPIO_CNF_SHIFT) | GPIO_OUTPUT_SET) /* Input pull-up */ # define GPIO_CNF_OUTPP (0 << GPIO_CNF_SHIFT) /* Output push-pull */ # define GPIO_CNF_OUTOD (1 << GPIO_CNF_SHIFT) /* Output open-drain */ @@ -114,13 +125,6 @@ #define GPIO_EXTI (1 << 10) /* Bit 10: Configure as EXTI interrupt */ -/* If the pin is an GPIO digital output, then this identifies the initial output value: - * .... .... V... .... - */ - -#define GPIO_OUTPUT_SET (1 << 7) /* Bit 7: If output, inital value of output */ -#define GPIO_OUTPUT_CLEAR (0) - /* This identifies the GPIO port: * .... .... .PPP .... */ |