diff options
| author | Jörg Hohensohn <hohensoh@rockbox.org> | 2004-09-28 22:13:26 +0000 |
|---|---|---|
| committer | Jörg Hohensohn <hohensoh@rockbox.org> | 2004-09-28 22:13:26 +0000 |
| commit | 593cc00447af20197a1b7bc009af205a0f065576 (patch) | |
| tree | f1793614a17b4e654d26b0c95b7842616ed8d919 /uisimulator | |
| parent | e6f83b695056d0afd7f76377d9d5fcbc4ac02dbc (diff) | |
| download | rockbox-593cc00447af20197a1b7bc009af205a0f065576.tar.gz rockbox-593cc00447af20197a1b7bc009af205a0f065576.zip | |
a hell of a commit: changed several HAVE_xx configuration flags into multiple choice values (keypad, tuner, CPU, h/w codec)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5126 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator')
| -rw-r--r-- | uisimulator/battery.c | 2 | ||||
| -rw-r--r-- | uisimulator/common/fmradio.c | 2 | ||||
| -rw-r--r-- | uisimulator/win32/button.c | 4 | ||||
| -rw-r--r-- | uisimulator/x11/button-x11.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/uisimulator/battery.c b/uisimulator/battery.c index 1af8e71787..d8580b42d1 100644 --- a/uisimulator/battery.c +++ b/uisimulator/battery.c @@ -22,7 +22,7 @@ #include "types.h" #include "lcd.h" #include "debug.h" -#define HAVE_RECORDER_KEYPAD +#define CONFIG_KEYPAD RECORDER_PAD #include "button.h" #ifdef SIMULATOR diff --git a/uisimulator/common/fmradio.c b/uisimulator/common/fmradio.c index 280a963f5a..a4cbd7977c 100644 --- a/uisimulator/common/fmradio.c +++ b/uisimulator/common/fmradio.c @@ -18,7 +18,7 @@ ****************************************************************************/ #include "debug.h" -#ifdef HAVE_FMRADIO +#ifdef CONFIG_TUNER static int fmstatus = 0; diff --git a/uisimulator/win32/button.c b/uisimulator/win32/button.c index 5d56456f6e..a304c366c4 100644 --- a/uisimulator/win32/button.c +++ b/uisimulator/win32/button.c @@ -124,9 +124,9 @@ void button_event(int key, bool pressed) #endif #ifdef BUTTON_MENU -#ifdef HAVE_PLAYER_KEYPAD +#if CONFIG_KEYPAD == PLAYER_PAD case VK_RETURN: -#elif defined HAVE_ONDIO_KEYPAD +#elif CONFIG_KEYPAD == ONDIO_PAD case VK_INSERT: #endif new_btn = BUTTON_MENU; diff --git a/uisimulator/x11/button-x11.c b/uisimulator/x11/button-x11.c index 534568b658..d6837f640a 100644 --- a/uisimulator/x11/button-x11.c +++ b/uisimulator/x11/button-x11.c @@ -145,10 +145,10 @@ static int get_raw_button (void) #endif #ifdef BUTTON_MENU -#ifdef HAVE_PLAYER_KEYPAD +#if CONFIG_KEYPAD == PLAYER_PAD case XK_KP_Enter: case XK_Return: -#elif defined HAVE_ONDIO_KEYPAD +#elif CONFIG_KEYPAD == ONDIO_PAD case XK_KP_Insert: case XK_Control_R: #endif |