diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2013-06-16 19:32:21 +0200 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2013-06-17 00:29:24 +0200 |
commit | 8f351d6e212e3b726a9d9020ed8a4119bb68e77e (patch) | |
tree | d4ab979baf0c6e56b90a3df5c2ace9cfb924cc47 /firmware/target/arm/imx233/creative-zenxfi3 | |
parent | 918a06a12ad633a29634f3249990ba04ce9fb00b (diff) | |
download | rockbox-8f351d6e212e3b726a9d9020ed8a4119bb68e77e.tar.gz rockbox-8f351d6e212e3b726a9d9020ed8a4119bb68e77e.tar.bz2 rockbox-8f351d6e212e3b726a9d9020ed8a4119bb68e77e.zip |
imx233: enhance pinctrl irq with user pointer
Change-Id: I191704299487598a853af4df5aebbbf8a7134a34
Diffstat (limited to 'firmware/target/arm/imx233/creative-zenxfi3')
-rw-r--r-- | firmware/target/arm/imx233/creative-zenxfi3/button-zenxfi3.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/firmware/target/arm/imx233/creative-zenxfi3/button-zenxfi3.c b/firmware/target/arm/imx233/creative-zenxfi3/button-zenxfi3.c index 7f981b5d68..c3f1908511 100644 --- a/firmware/target/arm/imx233/creative-zenxfi3/button-zenxfi3.c +++ b/firmware/target/arm/imx233/creative-zenxfi3/button-zenxfi3.c @@ -66,10 +66,11 @@ static long mpr121_stack[DEFAULT_STACK_SIZE/sizeof(long)]; static const char mpr121_thread_name[] = "mpr121"; static struct event_queue mpr121_queue; -static void mpr121_irq_cb(int bank, int pin) +static void mpr121_irq_cb(int bank, int pin, intptr_t user) { (void) bank; (void) pin; + (void) user; /* the callback will not be fired until interrupt is enabled back so * the queue will not overflow or contain multiple MPR121_INTERRUPT events */ queue_post(&mpr121_queue, MPR121_INTERRUPT, 0); @@ -107,7 +108,7 @@ static void mpr121_thread(void) if(status & 0x80) touchpad_btns |= BUTTON_PLAY; } /* enable interrupt */ - imx233_pinctrl_setup_irq(0, 18, true, true, false, &mpr121_irq_cb); + imx233_pinctrl_setup_irq(0, 18, true, true, false, &mpr121_irq_cb, 0); } } @@ -125,7 +126,7 @@ void button_init_device(void) imx233_pinctrl_acquire(0, 18, "mpr121 int"); imx233_pinctrl_set_function(0, 18, PINCTRL_FUNCTION_GPIO); imx233_pinctrl_enable_gpio(0, 18, false); - imx233_pinctrl_setup_irq(0, 18, true, true, false, &mpr121_irq_cb); + imx233_pinctrl_setup_irq(0, 18, true, true, false, &mpr121_irq_cb, 0); /* hold button */ imx233_pinctrl_acquire(0, 4, "hold"); imx233_pinctrl_set_function(0, 4, PINCTRL_FUNCTION_GPIO); |