len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 10:37:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

mrobe 100:

Browse source 
- 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
This commit is contained in:
Robert Kukla 2008-01-10 21:51:44 +00:00
parent ea5d196c7b
commit 12cc3cc47c
3 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

3
firmware/export/config-mrobe100.h
View file

@ -4,6 +4,9 @@
#define TARGET_TREE #define TARGET_TREE
/* until voltages are sorted out */
#define NO_LOW_BATTERY_SHUTDOWN
/* For Rolo and boot loader */ /* For Rolo and boot loader */
#define MODEL_NUMBER 23 #define MODEL_NUMBER 23
#define MODEL_NAME "Olympus m:robe MR-100" #define MODEL_NAME "Olympus m:robe MR-100"

13
firmware/target/arm/olympus/mrobe-100/button-mr100.c
View file

@ -27,10 +27,6 @@
#include "backlight-target.h" #include "backlight-target.h"
#include "system.h" #include "system.h"
void button_int(void)
{
}
void button_init_device(void) void button_init_device(void)
{ {
/* taken from the mr-100 bootloader (offset 0x1e72) */ /* taken from the mr-100 bootloader (offset 0x1e72) */
@ -46,12 +42,17 @@ void button_init_device(void)
*/ */
int button_read_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) bool button_hold(void)
{ {
return (GPIOD_INPUT_VAL & BUTTON_HOLD) ? false : true; return (GPIOD_INPUT_VAL & 0x10) ? false : true;
} }
bool headphones_inserted(void) bool headphones_inserted(void)

36
firmware/target/arm/olympus/mrobe-100/button-target.h
View file

@ -5,9 +5,9 @@
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/ * \/ \/ \/ \/ \/
* $Id$ * $Id$
* *
* Copyright (C) 2008 by Mark Arigo * Copyright (C) 2008 by Mark Arigo
* *
* All files in this archive are subject to the GNU General Public License. * 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. * 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); void button_init_device(void);
int button_read_device(void); int button_read_device(void);
/* Power button is on GPIOA */
#define BUTTON_POWER 0x80
#define POWEROFF_BUTTON BUTTON_POWER #define POWEROFF_BUTTON BUTTON_POWER
#define POWEROFF_COUNT 10 #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 /* FIXME: Until the buttons are figured out, we use the button definitions
for the H10 keypad & remote. THESE ARE NOT CORRECT! */ for the H10 keypad & remote. THESE ARE NOT CORRECT! */
/* Main unit's buttons */ /* Main unit's buttons */
#define BUTTON_LEFT 0x00000002 #define BUTTON_POWER 0x00000001
#define BUTTON_RIGHT 0x00000004 #define BUTTON_LEFT 0x00000002
#define BUTTON_REW 0x00000008 #define BUTTON_RIGHT 0x00000004
#define BUTTON_PLAY 0x00000010 #define BUTTON_REW 0x00000008
#define BUTTON_FF 0x00000020 #define BUTTON_PLAY 0x00000010
#define BUTTON_SCROLL_UP 0x00000040 #define BUTTON_FF 0x00000020
#define BUTTON_SCROLL_DOWN 0x00000080 #define BUTTON_SCROLL_UP 0x00000040
#define BUTTON_MAIN (BUTTON_POWER|BUTTON_O|BUTTON_BACK|BUTTON_REW\ #define BUTTON_SCROLL_DOWN 0x00000080
|BUTTON_PLAY|BUTTON_FF) #define BUTTON_MAIN (BUTTON_POWER|BUTTON_O|BUTTON_BACK|BUTTON_REW\
|BUTTON_PLAY|BUTTON_FF)
/* Remote control's buttons */ /* Remote control's buttons */
#define BUTTON_RC_REW 0x00080000 #define BUTTON_RC_REW 0x00080000
#define BUTTON_RC_PLAY 0x00100000 #define BUTTON_RC_PLAY 0x00100000