forked from len0rd/rockbox
m:robe 100:
- don't compile touchpad driver for bootloader - honour hold switch git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16531 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
5a75184c4a
commit
d6c23b4dd4
1 changed files with 9 additions and 1 deletions
|
|
@ -30,6 +30,9 @@
|
||||||
#define LOGF_ENABLE
|
#define LOGF_ENABLE
|
||||||
#include "logf.h"
|
#include "logf.h"
|
||||||
|
|
||||||
|
static int int_btn = BUTTON_NONE;
|
||||||
|
|
||||||
|
#ifndef BOOTLOADER
|
||||||
/* Driver for the Synaptics Touchpad based on the "Synaptics Modular Embedded
|
/* Driver for the Synaptics Touchpad based on the "Synaptics Modular Embedded
|
||||||
Protocol: 3-Wire Interface Specification" documentation */
|
Protocol: 3-Wire Interface Specification" documentation */
|
||||||
|
|
||||||
|
|
@ -59,7 +62,6 @@
|
||||||
#define ABSOLUTE_HEADER 0x0b
|
#define ABSOLUTE_HEADER 0x0b
|
||||||
|
|
||||||
static int syn_status = 0;
|
static int syn_status = 0;
|
||||||
static int int_btn = BUTTON_NONE;
|
|
||||||
|
|
||||||
static int syn_wait_clk_change(unsigned int val)
|
static int syn_wait_clk_change(unsigned int val)
|
||||||
{
|
{
|
||||||
|
|
@ -584,6 +586,9 @@ void button_int(void)
|
||||||
GPIOD_INT_EN |= 0x2;
|
GPIOD_INT_EN |= 0x2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
void button_init_device(void){}
|
||||||
|
#endif /* bootloader */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Get button pressed from hardware
|
* Get button pressed from hardware
|
||||||
|
|
@ -592,6 +597,9 @@ int button_read_device(void)
|
||||||
{
|
{
|
||||||
int btn = int_btn;
|
int btn = int_btn;
|
||||||
|
|
||||||
|
if(button_hold())
|
||||||
|
return BUTTON_NONE;
|
||||||
|
|
||||||
if (~GPIOA_INPUT_VAL & 0x40)
|
if (~GPIOA_INPUT_VAL & 0x40)
|
||||||
btn |= BUTTON_POWER;
|
btn |= BUTTON_POWER;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue