devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

remove some uneeded #ifdefs

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11393 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2006-10-30 09:29:01 +00:00
parent 139f9f28e9
commit d497bad69a
2 changed files with 1 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

3
firmware/drivers/button.c
View file

@ -308,9 +308,6 @@ void button_init(void)
#ifdef TARGET_TREE #ifdef TARGET_TREE
button_init_device(); button_init_device();
#elif CONFIG_KEYPAD == IRIVER_H100_PAD \
|| CONFIG_KEYPAD == IRIVER_H300_PAD
button_init_device(); /* temp untill TARGET_TREE is defined */
#elif CONFIG_KEYPAD == RECORDER_PAD #elif CONFIG_KEYPAD == RECORDER_PAD
/* Set PB4 and PB8 as input pins */ /* Set PB4 and PB8 as input pins */
PBCR1 &= 0xfffc; /* PB8MD = 00 */ PBCR1 &= 0xfffc; /* PB8MD = 00 */

31
firmware/export/button.h
View file

@ -72,10 +72,7 @@ void wheel_send_events(bool send);
#else #else
/* Target specific button codes */ /* Target specific button codes */
#if (CONFIG_KEYPAD == IRIVER_H100_PAD) \ #if CONFIG_KEYPAD == RECORDER_PAD
|| (CONFIG_KEYPAD == IRIVER_H300_PAD)
#include "button-target.h"
#elif CONFIG_KEYPAD == RECORDER_PAD
/* Recorder specific button codes */ /* Recorder specific button codes */
@ -113,32 +110,6 @@ void wheel_send_events(bool send);
#elif CONFIG_KEYPAD == PLAYER_PAD #elif CONFIG_KEYPAD == PLAYER_PAD
/* Jukebox 6000 and Studio specific button codes */
/* Main unit's buttons */
#define BUTTON_ON 0x00000001
#define BUTTON_STOP 0x00000002
#define BUTTON_LEFT 0x00000004
#define BUTTON_RIGHT 0x00000008
#define BUTTON_PLAY 0x00000010
#define BUTTON_MENU 0x00000020
#define BUTTON_MAIN (BUTTON_ON|BUTTON_STOP|BUTTON_LEFT|BUTTON_RIGHT\
|BUTTON_PLAY|BUTTON_MENU)
/* Remote control's buttons */
#define BUTTON_RC_PLAY 0x00100000
#define BUTTON_RC_STOP 0x00080000
#define BUTTON_RC_LEFT 0x00040000
#define BUTTON_RC_RIGHT 0x00020000
#define BUTTON_RC_VOL_UP 0x00010000
#define BUTTON_RC_VOL_DOWN 0x00008000
#define BUTTON_REMOTE (BUTTON_RC_PLAY|BUTTON_RC_STOP\
|BUTTON_RC_LEFT|BUTTON_RC_RIGHT\
|BUTTON_RC_VOL_UP|BUTTON_RC_VOL_DOWN)
#elif CONFIG_KEYPAD == ONDIO_PAD #elif CONFIG_KEYPAD == ONDIO_PAD