From 593cc00447af20197a1b7bc009af205a0f065576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Hohensohn?= Date: Tue, 28 Sep 2004 22:13:26 +0000 Subject: 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 --- firmware/drivers/button.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'firmware/drivers/button.c') diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index ebe3389..d05f81b 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c @@ -36,7 +36,7 @@ struct event_queue button_queue; static int lastbtn; /* Last valid button status */ -#if defined(HAVE_RECORDER_KEYPAD) || defined(HAVE_ONDIO_KEYPAD) +#if (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == ONDIO_PAD) static int last_read; /* Last button status, for debouncing/filtering */ static bool flipped; /* bottons can be flipped to match the LCD flip */ #endif @@ -179,7 +179,7 @@ int button_get_w_tmo(int ticks) return (ev.id != SYS_TIMEOUT)? ev.id: BUTTON_NONE; } -#ifdef HAVE_RECORDER_KEYPAD +#if CONFIG_KEYPAD == RECORDER_PAD /* AJBR buttons are connected to the CPU as follows: * @@ -348,7 +348,7 @@ static int button_read(void) return retval; } -#elif defined(HAVE_PLAYER_KEYPAD) +#elif CONFIG_KEYPAD == PLAYER_PAD /* The player has two buttons on port pins: @@ -397,7 +397,7 @@ static int button_read(void) return btn; } -#elif defined HAVE_ONDIO_KEYPAD +#elif CONFIG_KEYPAD == ONDIO_PAD /* * helper function to swap UP/DOWN, LEFT/RIGHT -- cgit v1.1