diff options
author | Daniel Stenberg <daniel@haxx.se> | 2005-06-18 21:17:20 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2005-06-18 21:17:20 +0000 |
commit | 3dd7593ac5278549076b63d1d022cb3e7a528e51 (patch) | |
tree | 1bc2f9666e00319aa12d8904b225ad571e45db00 /firmware/export | |
parent | 33d4c33504378192bf1bde67954efad8a2c575e1 (diff) | |
download | rockbox-3dd7593ac5278549076b63d1d022cb3e7a528e51.tar.gz rockbox-3dd7593ac5278549076b63d1d022cb3e7a528e51.zip |
Initial setup for the H300 keypad
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6754 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/button.h | 24 | ||||
-rw-r--r-- | firmware/export/config.h | 2 |
2 files changed, 24 insertions, 2 deletions
diff --git a/firmware/export/button.h b/firmware/export/button.h index 5b55cc54c7..40c374880b 100644 --- a/firmware/export/button.h +++ b/firmware/export/button.h | |||
@@ -34,7 +34,8 @@ void button_clear_queue(void); | |||
34 | void button_set_flip(bool flip); /* turn 180 degrees */ | 34 | void button_set_flip(bool flip); /* turn 180 degrees */ |
35 | #endif | 35 | #endif |
36 | 36 | ||
37 | #if CONFIG_KEYPAD == IRIVER_H100_PAD | 37 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
38 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
38 | bool button_hold(void); | 39 | bool button_hold(void); |
39 | bool remote_button_hold(void); | 40 | bool remote_button_hold(void); |
40 | #endif | 41 | #endif |
@@ -77,6 +78,27 @@ bool remote_button_hold(void); | |||
77 | #define BUTTON_RC_FF (BUTTON_REMOTE | 0x02000000) | 78 | #define BUTTON_RC_FF (BUTTON_REMOTE | 0x02000000) |
78 | #define BUTTON_RC_REW (BUTTON_REMOTE | 0x04000000) | 79 | #define BUTTON_RC_REW (BUTTON_REMOTE | 0x04000000) |
79 | 80 | ||
81 | #elif CONFIG_KEYPAD == IRIVER_H300_PAD | ||
82 | |||
83 | /* iRiver H300 specific button codes */ | ||
84 | #define BUTTON_SELECT 0x0100 | ||
85 | #define BUTTON_MODE 0x0200 | ||
86 | #define BUTTON_REC 0x0400 | ||
87 | #define BUTTON_ON 0x0001 | ||
88 | #define BUTTON_OFF 0x0002 | ||
89 | #define BUTTON_UP 0x0010 | ||
90 | #define BUTTON_DOWN 0x0020 | ||
91 | |||
92 | #define BUTTON_RC_ON (BUTTON_REMOTE | 0x00010000) | ||
93 | #define BUTTON_RC_STOP (BUTTON_REMOTE | 0x00020000) | ||
94 | #define BUTTON_RC_VOL (BUTTON_REMOTE | 0x00040000) | ||
95 | #define BUTTON_RC_BITRATE (BUTTON_REMOTE | 0x00200000) | ||
96 | #define BUTTON_RC_REC (BUTTON_REMOTE | 0x00400000) | ||
97 | #define BUTTON_RC_SOURCE (BUTTON_REMOTE | 0x00800000) | ||
98 | #define BUTTON_RC_MENU (BUTTON_REMOTE | 0x01000000) | ||
99 | #define BUTTON_RC_FF (BUTTON_REMOTE | 0x02000000) | ||
100 | #define BUTTON_RC_REW (BUTTON_REMOTE | 0x04000000) | ||
101 | |||
80 | #elif CONFIG_KEYPAD == RECORDER_PAD | 102 | #elif CONFIG_KEYPAD == RECORDER_PAD |
81 | 103 | ||
82 | /* Recorder specific button codes */ | 104 | /* Recorder specific button codes */ |
diff --git a/firmware/export/config.h b/firmware/export/config.h index c5b694ed8d..e0d901b587 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -45,7 +45,7 @@ | |||
45 | #define ONDIO_PAD 2 | 45 | #define ONDIO_PAD 2 |
46 | #define IRIVER_H100_PAD 3 | 46 | #define IRIVER_H100_PAD 3 |
47 | #define GMINI100_PAD 4 | 47 | #define GMINI100_PAD 4 |
48 | #define IRIVER_H300_PAD 3 | 48 | #define IRIVER_H300_PAD 5 |
49 | 49 | ||
50 | /* CONFIG_REMOTE_KEYPAD */ | 50 | /* CONFIG_REMOTE_KEYPAD */ |
51 | #define H100_REMOTE 0 | 51 | #define H100_REMOTE 0 |