devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

HD300 - do not handle scrollstrip events when hold is on

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28782 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Marcin Bukat 2010-12-10 15:12:16 +00:00
parent 029f0d5223
commit 18accc018b
1 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

39
firmware/target/coldfire/mpio/hd300/button-hd300.c
View file

@ -180,7 +180,14 @@ int button_read_device(void)
#ifndef BOOTLOADER #ifndef BOOTLOADER
/* Only main hold affects backlight */ /* Only main hold affects backlight */
if (hold_button != hold_button_old) if (hold_button != hold_button_old)
{
backlight_hold_changed(hold_button); backlight_hold_changed(hold_button);
if ( hold_button )
disable_scrollstrip_interrupts();
else
enable_scrollstrip_interrupts();
}
#endif #endif
/* Skip if main hold is active */ /* Skip if main hold is active */
@ -207,28 +214,26 @@ int button_read_device(void)
if (data > 950) if (data > 950)
btn |= BUTTON_REC; btn |= BUTTON_REC;
} }
}
/* Handle GPIOs buttons /* Handle GPIOs buttons
* *
* GPIO56 active high PLAY/PAUSE/ON * GPIO56 active high PLAY/PAUSE/ON
* GPIO45 active low ENTER * GPIO45 active low ENTER
* GPIO41 active low MENU * GPIO41 active low MENU
*/ */
data = GPIO1_READ; data = GPIO1_READ;
if (!hold_button) if (data & (1<<24))
{ btn |= BUTTON_PLAY;
if (data & (1<<24))
btn |= BUTTON_PLAY;
if (!(data & (1<<13))) if (!(data & (1<<13)))
btn |= BUTTON_ENTER; btn |= BUTTON_ENTER;
if (!(data & (1<<9))) if (!(data & (1<<9)))
btn |= BUTTON_MENU; btn |= BUTTON_MENU;
}
} /* !button_hold() */
return btn; return btn;
} }