diff options
| author | Tomas Salfischberger <tomas@rockbox.org> | 2005-06-08 15:55:19 +0000 |
|---|---|---|
| committer | Tomas Salfischberger <tomas@rockbox.org> | 2005-06-08 15:55:19 +0000 |
| commit | 6c999a9b53de2c3106c7e8374f7133d6f72205b9 (patch) | |
| tree | 79c9c4fe74b77fec5ee43ed10a60f76b423e5d7b /firmware/drivers/button.c | |
| parent | 1e5ff8ad0a6b2eda4d1c8410d281cb9c149dc3b0 (diff) | |
| download | rockbox-6c999a9b53de2c3106c7e8374f7133d6f72205b9.tar.gz rockbox-6c999a9b53de2c3106c7e8374f7133d6f72205b9.zip | |
More optimized fix (doing GPIO1_READ just once)
Formatting as amiconn wanted :)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6615 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/button.c')
| -rw-r--r-- | firmware/drivers/button.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index afdbccbfad..0ebb368325 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c | |||
| @@ -438,19 +438,12 @@ static int button_read(void) | |||
| 438 | } | 438 | } |
| 439 | 439 | ||
| 440 | /* special buttons */ | 440 | /* special buttons */ |
| 441 | if (!button_hold()) | 441 | data = GPIO1_READ; |
| 442 | { | 442 | if (!button_hold() && (data & 0x20 == 0)) |
| 443 | data = GPIO1_READ; | 443 | btn |= BUTTON_ON; |
| 444 | if ((data & 0x20) == 0) | 444 | if (!remote_button_hold() && (data & 0x40 == 0)) |
| 445 | btn |= BUTTON_ON; | 445 | btn |= BUTTON_RC_ON; |
| 446 | } | 446 | |
| 447 | |||
| 448 | if (!remote_button_hold()) | ||
| 449 | { | ||
| 450 | data = GPIO1_READ; | ||
| 451 | if ((data & 0x40) == 0) | ||
| 452 | btn |= BUTTON_RC_ON; | ||
| 453 | } | ||
| 454 | 447 | ||
| 455 | #elif CONFIG_KEYPAD == RECORDER_PAD | 448 | #elif CONFIG_KEYPAD == RECORDER_PAD |
| 456 | 449 | ||