diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-04-25 21:18:19 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-04-25 21:18:19 +0000 |
commit | 76ea067b8f2c7240d29af60b90bdfab005e7b766 (patch) | |
tree | e8ffedf70717855fb2f632a4ea7f468122434508 /nuttx/arch/arm/src/imx/imx_gpio.c | |
parent | 5fe2d3ad004c6d2e260f398d40ae0faa018cc17b (diff) | |
download | px4-nuttx-76ea067b8f2c7240d29af60b90bdfab005e7b766.tar.gz px4-nuttx-76ea067b8f2c7240d29af60b90bdfab005e7b766.tar.bz2 px4-nuttx-76ea067b8f2c7240d29af60b90bdfab005e7b766.zip |
imx update
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1738 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/imx/imx_gpio.c')
-rw-r--r-- | nuttx/arch/arm/src/imx/imx_gpio.c | 44 |
1 files changed, 28 insertions, 16 deletions
diff --git a/nuttx/arch/arm/src/imx/imx_gpio.c b/nuttx/arch/arm/src/imx/imx_gpio.c index 889faaf81..65d1b3d10 100644 --- a/nuttx/arch/arm/src/imx/imx_gpio.c +++ b/nuttx/arch/arm/src/imx/imx_gpio.c @@ -70,16 +70,16 @@ void imxgpio_configoutput(int port, int bit, int value) { - imxgpio_configinput(port, bit); /* Same as input except: */ - imxgpio_dirout(GPIOA, 2); /* Output */ + imxgpio_configinput(port, bit); /* Same as input except: */ + imxgpio_dirout(port, bit); /* Output */ if (value) { - imxgpio_setoutput(GPIOA, 2); /* Set output = 1 */ + imxgpio_setoutput(port, bit); /* Set output = 1 */ } else { - imxgpio_clroutput(GPIOA, 2); /* Set output = 0 */ + imxgpio_clroutput(port, bit); /* Set output = 0 */ } } @@ -89,22 +89,34 @@ void imxgpio_configoutput(int port, int bit, int value) void imxgpio_configinput(int port, int bit) { - imxgpio_pullupdisable(GPIOA, 2); /* No pullup */ - imxgpio_dirin(GPIOA, 2); /* Input */ - imxgpio_gpiofunc(GPIOA, 2); /* Use as GPIO */ - imxgpio_primaryperipheralfunc(GPIOA, 2); /* Not necessary */ - imxgpio_ocrain(GPIOA, 2); /* Output AIN */ - imxgpio_aoutgpio(GPIOA, 2); /* AOUT input is GPIO */ - imxgpio_boutgpio(GPIOA, 2); /* BOUT input is GPIO */ + imxgpio_pullupdisable(port, bit); /* No pullup */ + imxgpio_dirin(port, bit); /* Input */ + imxgpio_gpiofunc(port, bit); /* Use as GPIO */ + imxgpio_primaryperipheralfunc(port, bit); /* Not necessary */ + imxgpio_ocrain(port, bit); /* Output AIN */ + imxgpio_aoutgpio(port, bit); /* AOUT input is GPIO */ + imxgpio_boutgpio(port, bit); /* BOUT input is GPIO */ } /**************************************************************************** - * Name: imxgpio_configprimary + * Name: imxgpio_configpfoutput ****************************************************************************/ -void imxgpio_configprimary(int port, int bit) +void imxgpio_configpfoutput(int port, int bit) { - imxgpio_configinput(port, bit); /* Same as input except: */ - imxgpio_peripheralfunc(GPIOA, 2); /* Use as peripheral */ - imxgpio_primaryperipheralfunc(GPIOA, 2); /* Primary function*/ + imxgpio_configinput(port, bit); /* Same as input except: */ + imxgpio_peripheralfunc(port, bit); /* Use as peripheral */ + imxgpio_primaryperipheralfunc(port, bit); /* Primary function*/ + imxgpio_dirout(port, bit); /* Make output */ +} + +/**************************************************************************** + * Name: imxgpio_configpfinput + ****************************************************************************/ + +void imxgpio_configpfinput(int port, int bit) +{ + imxgpio_configinput(port, bit); /* Same as input except: */ + imxgpio_peripheralfunc(port, bit); /* Use as peripheral */ + imxgpio_primaryperipheralfunc(port, bit); /* Primary function*/ } |