summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm/olympus/mrobe-100
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/arm/olympus/mrobe-100')
-rw-r--r--firmware/target/arm/olympus/mrobe-100/button-mr100.c13
-rw-r--r--firmware/target/arm/olympus/mrobe-100/button-target.h36
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 @@
#include "backlight-target.h"
#include "system.h"
-void button_int(void)
-{
-}
-
void button_init_device(void)
{
/* taken from the mr-100 bootloader (offset 0x1e72) */
@@ -46,12 +42,17 @@ void button_init_device(void)
*/
int button_read_device(void)
{
- return BUTTON_NONE;
+ int btn = BUTTON_NONE;
+
+ if(~GPIOA_INPUT_VAL & 0x40)
+ btn |= BUTTON_POWER;
+
+ return btn;
}
bool button_hold(void)
{
- return (GPIOD_INPUT_VAL & BUTTON_HOLD) ? false : true;
+ return (GPIOD_INPUT_VAL & 0x10) ? false : true;
}
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 @@
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
- * $Id$
- *
- * Copyright (C) 2008 by Mark Arigo
+ * $Id$
+ *
+ * Copyright (C) 2008 by Mark Arigo
*
* All files in this archive are subject to the GNU General Public License.
* See the file COPYING in the source tree root for full license agreement.
@@ -29,28 +29,24 @@ bool button_hold(void);
void button_init_device(void);
int button_read_device(void);
-/* Power button is on GPIOA */
-#define BUTTON_POWER 0x80
#define POWEROFF_BUTTON BUTTON_POWER
#define POWEROFF_COUNT 10
-/* Hold button is on GPIOD */
-#define BUTTON_HOLD 0x10
-
/* FIXME: Until the buttons are figured out, we use the button definitions
for the H10 keypad & remote. THESE ARE NOT CORRECT! */
-
-/* Main unit's buttons */
-#define BUTTON_LEFT 0x00000002
-#define BUTTON_RIGHT 0x00000004
-#define BUTTON_REW 0x00000008
-#define BUTTON_PLAY 0x00000010
-#define BUTTON_FF 0x00000020
-#define BUTTON_SCROLL_UP 0x00000040
-#define BUTTON_SCROLL_DOWN 0x00000080
-#define BUTTON_MAIN (BUTTON_POWER|BUTTON_O|BUTTON_BACK|BUTTON_REW\
- |BUTTON_PLAY|BUTTON_FF)
-
+
+/* Main unit's buttons */
+#define BUTTON_POWER 0x00000001
+#define BUTTON_LEFT 0x00000002
+#define BUTTON_RIGHT 0x00000004
+#define BUTTON_REW 0x00000008
+#define BUTTON_PLAY 0x00000010
+#define BUTTON_FF 0x00000020
+#define BUTTON_SCROLL_UP 0x00000040
+#define BUTTON_SCROLL_DOWN 0x00000080
+#define BUTTON_MAIN (BUTTON_POWER|BUTTON_O|BUTTON_BACK|BUTTON_REW\
+ |BUTTON_PLAY|BUTTON_FF)
+
/* Remote control's buttons */
#define BUTTON_RC_REW 0x00080000
#define BUTTON_RC_PLAY 0x00100000