diff options
| author | Jörg Hohensohn <hohensoh@rockbox.org> | 2004-09-10 10:51:54 +0000 |
|---|---|---|
| committer | Jörg Hohensohn <hohensoh@rockbox.org> | 2004-09-10 10:51:54 +0000 |
| commit | 24c7c0489971d0ede3c23ea85b097990963d8ea1 (patch) | |
| tree | 911195d6162a12409aa7c5993b02dfa3f31ce08a /firmware/export | |
| parent | 6c1afd7a9e128f2ff628e3e4d2584024c2d8951f (diff) | |
| download | rockbox-24c7c0489971d0ede3c23ea85b097990963d8ea1.zip rockbox-24c7c0489971d0ede3c23ea85b097990963d8ea1.tar.gz rockbox-24c7c0489971d0ede3c23ea85b097990963d8ea1.tar.bz2 rockbox-24c7c0489971d0ede3c23ea85b097990963d8ea1.tar.xz | |
adjustment for the Ondio: button driver has an Odio part, for now it has a Player layout. Some fixes in the app code were necessary to remove dependencies of LCD, keypad, this wasn't independent everywhere.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5055 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
| -rw-r--r-- | firmware/export/button.h | 15 | ||||
| -rw-r--r-- | firmware/export/config-ondiofm.h | 7 | ||||
| -rw-r--r-- | firmware/export/config-ondiosp.h | 7 |
3 files changed, 16 insertions, 13 deletions
diff --git a/firmware/export/button.h b/firmware/export/button.h index f174262..0b6a08a 100644 --- a/firmware/export/button.h +++ b/firmware/export/button.h @@ -30,7 +30,7 @@ int button_get (bool block); int button_get_w_tmo(int ticks); int button_status(void); void button_clear_queue(void); -#ifdef HAVE_RECORDER_KEYPAD +#if defined(HAVE_RECORDER_KEYPAD) || defined(HAVE_ONDIO_KEYPAD) void button_set_flip(bool flip); /* turn 180 degrees */ #endif @@ -108,14 +108,23 @@ void button_set_flip(bool flip); /* turn 180 degrees */ #define BUTTON_F2 0x0200 #define BUTTON_F3 0x0400 -#elif HAVE_PLAYER_KEYPAD +#elif defined(HAVE_PLAYER_KEYPAD) /* Jukebox 6000 and Studio specific button codes */ #define BUTTON_MENU 0x0002 #define BUTTON_PLAY BUTTON_UP #define BUTTON_STOP BUTTON_DOWN -#endif /* HAVE_PLAYER_KEYPAD */ +#elif defined HAVE_ONDIO_KEYPAD + +/* Ondio specific button codes */ +#define BUTTON_MENU 0x0002 +#define BUTTON_PLAY BUTTON_UP +#define BUTTON_STOP BUTTON_DOWN +/* ON is also interpreted as OFF, let's see if that helps a bit */ +#define BUTTON_OFF BUTTON_ON + +#endif /* HAVE_RECORDER/PLAYER/ONDIO_KEYPAD */ #endif /* HAVE_NEO_KEYPAD */ diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h index 0f71ea6..33ede51 100644 --- a/firmware/export/config-ondiofm.h +++ b/firmware/export/config-ondiofm.h @@ -4,11 +4,8 @@ /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP 1 -/* define this if you have a Recorder style 10-key keyboard */ -#define HAVE_RECORDER_KEYPAD 0 - -/* define this if you have a real-time clock */ -#define HAVE_RTC 0 +/* define this if you have an Ondio style 6-key keyboard */ +#define HAVE_ONDIO_KEYPAD /* Define this if you have a MAS3587F */ #define HAVE_MAS3587F diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h index 8e2a9d6..3e8116d 100644 --- a/firmware/export/config-ondiosp.h +++ b/firmware/export/config-ondiosp.h @@ -4,11 +4,8 @@ /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP 1 -/* define this if you have a Recorder style 10-key keyboard */ -#define HAVE_RECORDER_KEYPAD 0 - -/* define this if you have a real-time clock */ -#define HAVE_RTC 0 +/* define this if you have an Ondio style 6-key keyboard */ +#define HAVE_ONDIO_KEYPAD /* Define this if you have a MAS3587F */ #define HAVE_MAS3587F |