diff options
author | Robert Kukla <roolku@rockbox.org> | 2008-01-10 21:51:44 +0000 |
---|---|---|
committer | Robert Kukla <roolku@rockbox.org> | 2008-01-10 21:51:44 +0000 |
commit | 12cc3cc47cf4820a323fabf9815076705b9dd8fb (patch) | |
tree | e6962c332bfc3232353e2e191bde275afc504142 /firmware/target/arm | |
parent | ea5d196c7bf6aad50c875841b9369bb192b8fa06 (diff) | |
download | rockbox-12cc3cc47cf4820a323fabf9815076705b9dd8fb.tar.gz rockbox-12cc3cc47cf4820a323fabf9815076705b9dd8fb.zip |
mrobe 100:
- temporarily disable shutdown on low power
- enable power button for minimal interaction (not shutdown yet)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16049 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm')
-rw-r--r-- | firmware/target/arm/olympus/mrobe-100/button-mr100.c | 13 | ||||
-rw-r--r-- | firmware/target/arm/olympus/mrobe-100/button-target.h | 36 |
2 files changed, 23 insertions, 26 deletions
diff --git a/firmware/target/arm/olympus/mrobe-100/button-mr100.c b/firmware/target/arm/olympus/mrobe-100/button-mr100.c index 141a6d5b0c..49561cb8d7 100644 --- a/firmware/target/arm/olympus/mrobe-100/button-mr100.c +++ b/firmware/target/arm/olympus/mrobe-100/button-mr100.c | |||
@@ -27,10 +27,6 @@ | |||
27 | #include "backlight-target.h" | 27 | #include "backlight-target.h" |
28 | #include "system.h" | 28 | #include "system.h" |
29 | 29 | ||
30 | void button_int(void) | ||
31 | { | ||
32 | } | ||
33 | |||
34 | void button_init_device(void) | 30 | void button_init_device(void) |
35 | { | 31 | { |
36 | /* taken from the mr-100 bootloader (offset 0x1e72) */ | 32 | /* taken from the mr-100 bootloader (offset 0x1e72) */ |
@@ -46,12 +42,17 @@ void button_init_device(void) | |||
46 | */ | 42 | */ |
47 | int button_read_device(void) | 43 | int button_read_device(void) |
48 | { | 44 | { |
49 | return BUTTON_NONE; | 45 | int btn = BUTTON_NONE; |
46 | |||
47 | if(~GPIOA_INPUT_VAL & 0x40) | ||
48 | btn |= BUTTON_POWER; | ||
49 | |||
50 | return btn; | ||
50 | } | 51 | } |
51 | 52 | ||
52 | bool button_hold(void) | 53 | bool button_hold(void) |
53 | { | 54 | { |
54 | return (GPIOD_INPUT_VAL & BUTTON_HOLD) ? false : true; | 55 | return (GPIOD_INPUT_VAL & 0x10) ? false : true; |
55 | } | 56 | } |
56 | 57 | ||
57 | bool headphones_inserted(void) | 58 | bool headphones_inserted(void) |
diff --git a/firmware/target/arm/olympus/mrobe-100/button-target.h b/firmware/target/arm/olympus/mrobe-100/button-target.h index 99f17bb09b..c7d9114004 100644 --- a/firmware/target/arm/olympus/mrobe-100/button-target.h +++ b/firmware/target/arm/olympus/mrobe-100/button-target.h | |||
@@ -5,9 +5,9 @@ | |||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | 5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < |
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * $Id$ | 8 | * $Id$ |
9 | * | 9 | * |
10 | * Copyright (C) 2008 by Mark Arigo | 10 | * Copyright (C) 2008 by Mark Arigo |
11 | * | 11 | * |
12 | * All files in this archive are subject to the GNU General Public License. | 12 | * All files in this archive are subject to the GNU General Public License. |
13 | * See the file COPYING in the source tree root for full license agreement. | 13 | * See the file COPYING in the source tree root for full license agreement. |
@@ -29,28 +29,24 @@ bool button_hold(void); | |||
29 | void button_init_device(void); | 29 | void button_init_device(void); |
30 | int button_read_device(void); | 30 | int button_read_device(void); |
31 | 31 | ||
32 | /* Power button is on GPIOA */ | ||
33 | #define BUTTON_POWER 0x80 | ||
34 | #define POWEROFF_BUTTON BUTTON_POWER | 32 | #define POWEROFF_BUTTON BUTTON_POWER |
35 | #define POWEROFF_COUNT 10 | 33 | #define POWEROFF_COUNT 10 |
36 | 34 | ||
37 | /* Hold button is on GPIOD */ | ||
38 | #define BUTTON_HOLD 0x10 | ||
39 | |||
40 | /* FIXME: Until the buttons are figured out, we use the button definitions | 35 | /* FIXME: Until the buttons are figured out, we use the button definitions |
41 | for the H10 keypad & remote. THESE ARE NOT CORRECT! */ | 36 | for the H10 keypad & remote. THESE ARE NOT CORRECT! */ |
42 | 37 | ||
43 | /* Main unit's buttons */ | 38 | /* Main unit's buttons */ |
44 | #define BUTTON_LEFT 0x00000002 | 39 | #define BUTTON_POWER 0x00000001 |
45 | #define BUTTON_RIGHT 0x00000004 | 40 | #define BUTTON_LEFT 0x00000002 |
46 | #define BUTTON_REW 0x00000008 | 41 | #define BUTTON_RIGHT 0x00000004 |
47 | #define BUTTON_PLAY 0x00000010 | 42 | #define BUTTON_REW 0x00000008 |
48 | #define BUTTON_FF 0x00000020 | 43 | #define BUTTON_PLAY 0x00000010 |
49 | #define BUTTON_SCROLL_UP 0x00000040 | 44 | #define BUTTON_FF 0x00000020 |
50 | #define BUTTON_SCROLL_DOWN 0x00000080 | 45 | #define BUTTON_SCROLL_UP 0x00000040 |
51 | #define BUTTON_MAIN (BUTTON_POWER|BUTTON_O|BUTTON_BACK|BUTTON_REW\ | 46 | #define BUTTON_SCROLL_DOWN 0x00000080 |
52 | |BUTTON_PLAY|BUTTON_FF) | 47 | #define BUTTON_MAIN (BUTTON_POWER|BUTTON_O|BUTTON_BACK|BUTTON_REW\ |
53 | 48 | |BUTTON_PLAY|BUTTON_FF) | |
49 | |||
54 | /* Remote control's buttons */ | 50 | /* Remote control's buttons */ |
55 | #define BUTTON_RC_REW 0x00080000 | 51 | #define BUTTON_RC_REW 0x00080000 |
56 | #define BUTTON_RC_PLAY 0x00100000 | 52 | #define BUTTON_RC_PLAY 0x00100000 |