summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Bertani <mail@thomasbertani.it>2012-09-05 21:33:41 +0200
committerThomas Bertani <mail@thomasbertani.it>2012-09-05 21:33:41 +0200
commit67b2eeccb50a1a6832d77fb336d7c67f867c69fb (patch)
tree7541a702ddfa5fdc9e1141e322da778c0b26efb3
parent65e2d5abe68a87785a90f1dbb16825c7bdd52149 (diff)
Calypso keypad driver: fixed broken initializationkeypad
Signed-off-by: Thomas Bertani <mail@thomasbertani.it>
-rw-r--r--nuttx/arch/arm/src/calypso/Make.defs2
-rw-r--r--nuttx/arch/arm/src/calypso/calypso_initialize.c7
-rw-r--r--nuttx/arch/arm/src/common/up_initialize.c3
3 files changed, 4 insertions, 8 deletions
diff --git a/nuttx/arch/arm/src/calypso/Make.defs b/nuttx/arch/arm/src/calypso/Make.defs
index f1ad698a65..94de5d29e4 100644
--- a/nuttx/arch/arm/src/calypso/Make.defs
+++ b/nuttx/arch/arm/src/calypso/Make.defs
@@ -46,7 +46,7 @@ CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c up_copystate.c \
up_interruptcontext.c up_prefetchabort.c up_releasepending.c \
up_releasestack.c up_reprioritizertr.c up_schedulesigaction.c \
up_sigdeliver.c up_syscall.c up_unblocktask.c \
- up_undefinedinsn.c up_usestack.c calypso_power.c calypso_initialize.c
+ up_undefinedinsn.c up_usestack.c calypso_power.c
CHIP_ASRCS = calypso_lowputc.S
CHIP_CSRCS = calypso_irq.c calypso_timer.c calypso_heap.c \
diff --git a/nuttx/arch/arm/src/calypso/calypso_initialize.c b/nuttx/arch/arm/src/calypso/calypso_initialize.c
deleted file mode 100644
index 754cc1a4c8..0000000000
--- a/nuttx/arch/arm/src/calypso/calypso_initialize.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <nuttx/arch.h>
-
-void up_initialize(void)
-{
- (void)calypso_armio();
- (void)calypso_keypad();
-}
diff --git a/nuttx/arch/arm/src/common/up_initialize.c b/nuttx/arch/arm/src/common/up_initialize.c
index db15a3e1e8..03eca54a1e 100644
--- a/nuttx/arch/arm/src/common/up_initialize.c
+++ b/nuttx/arch/arm/src/common/up_initialize.c
@@ -188,5 +188,8 @@ void up_initialize(void)
up_usbinitialize();
up_ledon(LED_IRQSENABLED);
+
+ /* Initialize the keypad driver */
+ calypso_armio();
up_keypad();
}