diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-01 23:03:37 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-05-01 23:03:37 +0000 |
| commit | f13e7a39a9af94a2f8706b62f2fb1aabc26cb67c (patch) | |
| tree | 9c7fdc171e1fde64b63d2b0f215efe92828567fc /nuttx/arch/arm/src/calypso/calypso_armio.c | |
| parent | fe90fbdbd18eed8712bbc30909efb1b7870f859f (diff) | |
| download | px4-nuttx-f13e7a39a9af94a2f8706b62f2fb1aabc26cb67c.tar.gz px4-nuttx-f13e7a39a9af94a2f8706b62f2fb1aabc26cb67c.tar.bz2 px4-nuttx-f13e7a39a9af94a2f8706b62f2fb1aabc26cb67c.zip | |
Calypso update
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4684 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/calypso/calypso_armio.c')
| -rw-r--r-- | nuttx/arch/arm/src/calypso/calypso_armio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nuttx/arch/arm/src/calypso/calypso_armio.c b/nuttx/arch/arm/src/calypso/calypso_armio.c index 59c5a79e7..56f049f94 100644 --- a/nuttx/arch/arm/src/calypso/calypso_armio.c +++ b/nuttx/arch/arm/src/calypso/calypso_armio.c @@ -41,6 +41,7 @@ #include <arch/calypso/memory.h> #include <arch/calypso/armio.h> +#include "up_arch.h" /**************************************************************************** * HW access @@ -92,10 +93,10 @@ static int kbd_gpio_irq(int irq, uint32_t *regs) void calypso_armio(void) { /* Enable ARMIO clock */ - writew(1<<5, ARMIO_REG(CNTL_REG)); + putreg16(1<<5, ARMIO_REG(CNTL_REG)); /* Mask GPIO interrupt and keypad interrupt */ - writew(KBD_INT|GPIO_INT, ARMIO_REG(KBD_GPIO_MASKIT)); + putreg16(KBD_INT|GPIO_INT, ARMIO_REG(KBD_GPIO_MASKIT)); /* Attach and enable the interrupt */ irq_attach(IRQ_KEYPAD_GPIO, (xcpt_t)kbd_gpio_irq); |