1
0
Fork 0
forked from len0rd/rockbox

e200: Update the button init code to be more correct for using GPIO IRQs.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13539 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2007-06-03 15:17:01 +00:00
parent 5c32faad43
commit ebe67b28e3

View file

@ -45,6 +45,8 @@ static bool hold_button_old = false;
#endif /* BOOTLOADER */ #endif /* BOOTLOADER */
static int int_btn = BUTTON_NONE; static int int_btn = BUTTON_NONE;
void button_int(void);
void button_init_device(void) void button_init_device(void)
{ {
/* Enable all buttons */ /* Enable all buttons */
@ -56,6 +58,11 @@ void button_init_device(void)
GPIOG_ENABLE = 0x80; GPIOG_ENABLE = 0x80;
#ifndef BOOTLOADER #ifndef BOOTLOADER
/* Mask these before performing init ... because init has possibly
occurred before */
GPIOF_INT_EN &= ~0xff;
GPIOH_INT_EN &= ~0xc0;
/* Get current tick before enabling button interrupts */ /* Get current tick before enabling button interrupts */
last_wheel_tick = current_tick; last_wheel_tick = current_tick;
last_wheel_post = current_tick; last_wheel_post = current_tick;
@ -63,21 +70,18 @@ void button_init_device(void)
GPIOH_ENABLE |= 0xc0; GPIOH_ENABLE |= 0xc0;
GPIOH_OUTPUT_EN &= ~0xc0; GPIOH_OUTPUT_EN &= ~0xc0;
GPIOF_INT_CLR = 0xff;
GPIOH_INT_CLR = 0xc0;
/* Read initial buttons */ /* Read initial buttons */
old_wheel_value = GPIOF_INPUT_VAL & 0xff; button_int();
GPIOF_INT_LEV = (GPIOF_INT_LEV & ~0xff) | (old_wheel_value ^ 0xff); GPIOF_INT_CLR = 0xff;
hold_button = (GPIOF_INPUT_VAL & 0x80) != 0;
/* Read initial wheel value (bit 6-7 of GPIOH) */ /* Read initial wheel value (bit 6-7 of GPIOH) */
old_wheel_value = GPIOH_INPUT_VAL & 0xc0; old_wheel_value = GPIOH_INPUT_VAL & 0xc0;
GPIOH_INT_LEV = (GPIOH_INT_LEV & ~0xc0) | (old_wheel_value ^ 0xc0); GPIOH_INT_LEV = (GPIOH_INT_LEV & ~0xc0) | (old_wheel_value ^ 0xc0);
GPIOH_INT_CLR = 0xc0;
/* Enable button interrupts */ /* Enable button interrupts */
GPIOF_INT_EN = 0xff; GPIOF_INT_EN |= 0xff;
GPIOH_INT_EN = 0xc0; GPIOH_INT_EN |= 0xc0;
CPU_INT_EN = HI_MASK; CPU_INT_EN = HI_MASK;
CPU_HI_INT_EN = GPIO_MASK; CPU_HI_INT_EN = GPIO_MASK;