diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2005-06-22 23:24:45 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2005-06-22 23:24:45 +0000 |
| commit | 337f3a1b99a01f12ef0aea7bf67ddb727899d208 (patch) | |
| tree | 5bc3e6a777edfabd7de11722d20c221737db19f6 /apps | |
| parent | 7ec8aa2a2c356f5929daa44e9e38386107d70f44 (diff) | |
| download | rockbox-337f3a1b99a01f12ef0aea7bf67ddb727899d208.tar.gz rockbox-337f3a1b99a01f12ef0aea7bf67ddb727899d208.zip | |
Make the simulator builds know about software poweroff, for more consistent behaviour to the targets. Changed some #if conditions to better reflect the hardware. Fixes iriver sim.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6833 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/tree.c b/apps/tree.c index b096b8927f..1332fc07ba 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
| @@ -820,7 +820,7 @@ static bool dirbrowse(void) | |||
| 820 | break; | 820 | break; |
| 821 | 821 | ||
| 822 | #ifdef TREE_OFF | 822 | #ifdef TREE_OFF |
| 823 | #ifndef HAVE_SW_POWEROFF | 823 | #if (CONFIG_KEYPAD == RECORDER_PAD) && !defined(HAVE_SW_POWEROFF) |
| 824 | case TREE_OFF: | 824 | case TREE_OFF: |
| 825 | if (*tc.dirfilter < NUM_FILTER_MODES) | 825 | if (*tc.dirfilter < NUM_FILTER_MODES) |
| 826 | { | 826 | { |
| @@ -839,7 +839,7 @@ static bool dirbrowse(void) | |||
| 839 | } | 839 | } |
| 840 | break; | 840 | break; |
| 841 | #endif | 841 | #endif |
| 842 | #if defined(HAVE_CHARGING) && !defined(IRIVER_H100) | 842 | #if defined(HAVE_CHARGING) && !defined(HAVE_POWEROFF_WHILE_CHARGING) |
| 843 | case TREE_OFF | BUTTON_REPEAT: | 843 | case TREE_OFF | BUTTON_REPEAT: |
| 844 | if (charger_inserted()) { | 844 | if (charger_inserted()) { |
| 845 | charging_splash(); | 845 | charging_splash(); |