summaryrefslogtreecommitdiffstats
path: root/src/target/firmware/calypso/keypad.c
diff options
context:
space:
mode:
authorIngo Albrecht2010-02-24 02:33:14 +0100
committerHarald Welte2010-03-07 11:47:09 +0100
commit842dbc31d1e1203a0cf133a17ceef5a89d495d69 (patch)
tree9d46333774268748aa6361a71742652ed9c08259 /src/target/firmware/calypso/keypad.c
parentSome msgb formatting functions. (diff)
downloadosmocom-842dbc31d1e1203a0cf133a17ceef5a89d495d69.tar.gz
osmocom-842dbc31d1e1203a0cf133a17ceef5a89d495d69.tar.xz
osmocom-842dbc31d1e1203a0cf133a17ceef5a89d495d69.zip
Allow use of keypad driver without interrupts.
Diffstat (limited to 'src/target/firmware/calypso/keypad.c')
-rw-r--r--src/target/firmware/calypso/keypad.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/target/firmware/calypso/keypad.c b/src/target/firmware/calypso/keypad.c
index 27f48c0..4afd51b 100644
--- a/src/target/firmware/calypso/keypad.c
+++ b/src/target/firmware/calypso/keypad.c
@@ -113,18 +113,20 @@ void dispatch_buttons(uint32_t buttons)
static void keypad_irq(enum irq_nr nr)
{
- keypad_scan();
+ keypad_poll();
}
-void keypad_init()
+void keypad_init(uint8_t interrupts)
{
lastbuttons = 0;
writew(0, KBD_GPIO_MASKIT);
writew(0, KBC_REG);
- irq_register_handler(IRQ_KEYPAD_GPIO, &keypad_irq);
- irq_config(IRQ_KEYPAD_GPIO, 0, 0, 0);
- irq_enable(IRQ_KEYPAD_GPIO);
+ if(interrupts) {
+ irq_register_handler(IRQ_KEYPAD_GPIO, &keypad_irq);
+ irq_config(IRQ_KEYPAD_GPIO, 0, 0, 0);
+ irq_enable(IRQ_KEYPAD_GPIO);
+ }
}
void keypad_set_handler(key_handler_t handler)
@@ -132,7 +134,7 @@ void keypad_set_handler(key_handler_t handler)
key_handler = handler;
}
-void keypad_scan()
+void keypad_poll()
{
uint16_t reg;
uint16_t col;