1
0
Fork 0
forked from len0rd/rockbox

iriver: only show remote lock icon if remote is locked and plugged.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8057 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Magnus Holmgren 2005-11-23 21:50:09 +00:00
parent 3e8b9f6915
commit a04b1d418d

View file

@ -58,6 +58,7 @@ static bool flipped; /* buttons can be flipped to match the LCD flip */
#define POWEROFF_COUNT 10 #define POWEROFF_COUNT 10
static int button_read(void); static int button_read(void);
static bool remote_button_hold_only(void);
static void button_tick(void) static void button_tick(void)
{ {
@ -387,13 +388,13 @@ static int button_read(void)
{ {
backlight_on(); backlight_on();
} }
if (remote_hold_button && !remote_button_hold()) if (remote_hold_button && !remote_button_hold_only())
{ {
remote_backlight_on(); remote_backlight_on();
} }
hold_button = button_hold(); hold_button = button_hold();
remote_hold_button = remote_button_hold(); remote_hold_button = remote_button_hold_only();
/* normal buttons */ /* normal buttons */
if (!hold_button) if (!hold_button)
@ -478,13 +479,13 @@ static int button_read(void)
{ {
backlight_on(); backlight_on();
} }
if (remote_hold_button && !remote_button_hold()) if (remote_hold_button && !remote_button_hold_only())
{ {
remote_backlight_on(); remote_backlight_on();
} }
hold_button = button_hold(); hold_button = button_hold();
remote_hold_button = remote_button_hold(); remote_hold_button = remote_button_hold_only();
/* normal buttons */ /* normal buttons */
if (!hold_button) if (!hold_button)
@ -696,10 +697,15 @@ bool button_hold(void)
return (GPIO1_READ & 0x00000002)?true:false; return (GPIO1_READ & 0x00000002)?true:false;
} }
bool remote_button_hold(void) static bool remote_button_hold_only(void)
{ {
return (GPIO1_READ & 0x00100000)?true:false; return (GPIO1_READ & 0x00100000)?true:false;
} }
bool remote_button_hold(void)
{
return ((GPIO_READ & 0x40000000) == 0)?remote_button_hold_only():false;
}
#endif #endif
int button_status(void) int button_status(void)