diff options
Diffstat (limited to 'apps/plugins/rockboy/sys_rockbox.c')
-rw-r--r-- | apps/plugins/rockboy/sys_rockbox.c | 43 |
1 files changed, 9 insertions, 34 deletions
diff --git a/apps/plugins/rockboy/sys_rockbox.c b/apps/plugins/rockboy/sys_rockbox.c index 6cbbe523f7..60cac0a88d 100644 --- a/apps/plugins/rockboy/sys_rockbox.c +++ b/apps/plugins/rockboy/sys_rockbox.c | |||
@@ -24,36 +24,11 @@ | |||
24 | #include "hw.h" | 24 | #include "hw.h" |
25 | #include "config.h" | 25 | #include "config.h" |
26 | 26 | ||
27 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) | 27 | #if (CONFIG_KEYPAD == SANSA_E200_PAD) |
28 | |||
29 | #define ROCKBOY_PAD_LEFT BUTTON_LEFT | ||
30 | #define ROCKBOY_PAD_RIGHT BUTTON_RIGHT | ||
31 | #define ROCKBOY_PAD_UP BUTTON_MENU | ||
32 | #define ROCKBOY_PAD_DOWN BUTTON_PLAY | ||
33 | |||
34 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) | ||
35 | |||
36 | #define ROCKBOY_PAD_LEFT BUTTON_LEFT | ||
37 | #define ROCKBOY_PAD_RIGHT BUTTON_RIGHT | ||
38 | #define ROCKBOY_PAD_UP BUTTON_SCROLL_UP | ||
39 | #define ROCKBOY_PAD_DOWN BUTTON_SCROLL_DOWN | ||
40 | |||
41 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) | ||
42 | 28 | ||
43 | #define ROCKBOY_SCROLLWHEEL | 29 | #define ROCKBOY_SCROLLWHEEL |
44 | #define ROCKBOY_SCROLLWHEEL_CC BUTTON_SCROLL_UP | 30 | #define ROCKBOY_SCROLLWHEEL_CC BUTTON_SCROLL_UP |
45 | #define ROCKBOY_SCROLLWHEEL_CW BUTTON_SCROLL_DOWN | 31 | #define ROCKBOY_SCROLLWHEEL_CW BUTTON_SCROLL_DOWN |
46 | #define ROCKBOY_PAD_LEFT BUTTON_LEFT | ||
47 | #define ROCKBOY_PAD_RIGHT BUTTON_RIGHT | ||
48 | #define ROCKBOY_PAD_UP BUTTON_UP | ||
49 | #define ROCKBOY_PAD_DOWN BUTTON_DOWN | ||
50 | |||
51 | #else | ||
52 | |||
53 | #define ROCKBOY_PAD_LEFT BUTTON_LEFT | ||
54 | #define ROCKBOY_PAD_RIGHT BUTTON_RIGHT | ||
55 | #define ROCKBOY_PAD_UP BUTTON_UP | ||
56 | #define ROCKBOY_PAD_DOWN BUTTON_DOWN | ||
57 | 32 | ||
58 | #endif | 33 | #endif |
59 | 34 | ||
@@ -159,10 +134,10 @@ void ev_poll(void) | |||
159 | #else | 134 | #else |
160 | if(released) { | 135 | if(released) { |
161 | ev.type = EV_RELEASE; | 136 | ev.type = EV_RELEASE; |
162 | if(released & ROCKBOY_PAD_LEFT) { ev.code=PAD_LEFT; ev_postevent(&ev); } | 137 | if(released & options.LEFT) { ev.code=PAD_LEFT; ev_postevent(&ev); } |
163 | if(released & ROCKBOY_PAD_RIGHT) {ev.code=PAD_RIGHT; ev_postevent(&ev);} | 138 | if(released & options.RIGHT) {ev.code=PAD_RIGHT; ev_postevent(&ev);} |
164 | if(released & ROCKBOY_PAD_DOWN) { ev.code=PAD_DOWN; ev_postevent(&ev); } | 139 | if(released & options.DOWN) { ev.code=PAD_DOWN; ev_postevent(&ev); } |
165 | if(released & ROCKBOY_PAD_UP) { ev.code=PAD_UP; ev_postevent(&ev); } | 140 | if(released & options.UP) { ev.code=PAD_UP; ev_postevent(&ev); } |
166 | if(released & options.A) { ev.code=PAD_A; ev_postevent(&ev); } | 141 | if(released & options.A) { ev.code=PAD_A; ev_postevent(&ev); } |
167 | if(released & options.B) { ev.code=PAD_B; ev_postevent(&ev); } | 142 | if(released & options.B) { ev.code=PAD_B; ev_postevent(&ev); } |
168 | if(released & options.START) { | 143 | if(released & options.START) { |
@@ -176,10 +151,10 @@ void ev_poll(void) | |||
176 | } | 151 | } |
177 | if(pressed) { /* button press */ | 152 | if(pressed) { /* button press */ |
178 | ev.type = EV_PRESS; | 153 | ev.type = EV_PRESS; |
179 | if(pressed & ROCKBOY_PAD_LEFT) { ev.code=PAD_LEFT; ev_postevent(&ev); } | 154 | if(pressed & options.LEFT) { ev.code=PAD_LEFT; ev_postevent(&ev); } |
180 | if(pressed & ROCKBOY_PAD_RIGHT) { ev.code=PAD_RIGHT; ev_postevent(&ev);} | 155 | if(pressed & options.RIGHT) { ev.code=PAD_RIGHT; ev_postevent(&ev);} |
181 | if(pressed & ROCKBOY_PAD_DOWN) { ev.code=PAD_DOWN; ev_postevent(&ev); } | 156 | if(pressed & options.DOWN) { ev.code=PAD_DOWN; ev_postevent(&ev); } |
182 | if(pressed & ROCKBOY_PAD_UP) { ev.code=PAD_UP; ev_postevent(&ev); } | 157 | if(pressed & options.UP) { ev.code=PAD_UP; ev_postevent(&ev); } |
183 | if(pressed & options.A) { ev.code=PAD_A; ev_postevent(&ev); } | 158 | if(pressed & options.A) { ev.code=PAD_A; ev_postevent(&ev); } |
184 | if(pressed & options.B) { ev.code=PAD_B; ev_postevent(&ev); } | 159 | if(pressed & options.B) { ev.code=PAD_B; ev_postevent(&ev); } |
185 | if(pressed & options.START) { | 160 | if(pressed & options.START) { |