aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/common
diff options
context:
space:
mode:
authorManuel Capinha <mcapinha@gmail.com>2005-06-24 01:04:53 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-24 03:06:38 -0400
commit239df2e2b0e1f4f69fdf76fb67e865824029e8ab (patch)
tree57088068f1f464c9d1c71f9a4e9dccfcd5106c66 /drivers/media/common
parentd81ef559daf2a8afa9292035d58b00e7cb23dd1a (diff)
[PATCH] v4l: add support for PixelView Ultra Pro
The following patch adds support for the PixelView Ultra Pro video capture card in v4l. - It removes the remote control key definitions from ir-kbd-gpio.c and moves them to ir-common.c so that they can be shared between bt878 and cx88 based cards. - The patch also moves the FUSIONHDTV_3_GOLD_Q card from number 27 to 28 to regain compatibility with the V4L cvs. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/common')
-rw-r--r--drivers/media/common/ir-common.c33
1 files changed, 33 insertions, 0 deletions
diff --git a/drivers/media/common/ir-common.c b/drivers/media/common/ir-common.c
index 84a49d2ec919..e5636ef181bb 100644
--- a/drivers/media/common/ir-common.c
+++ b/drivers/media/common/ir-common.c
@@ -213,6 +213,39 @@ IR_KEYTAB_TYPE ir_codes_hauppauge_new[IR_KEYTAB_SIZE] = {
213}; 213};
214EXPORT_SYMBOL(ir_codes_hauppauge_new); 214EXPORT_SYMBOL(ir_codes_hauppauge_new);
215 215
216IR_KEYTAB_TYPE ir_codes_pixelview[IR_KEYTAB_SIZE] = {
217 [ 2 ] = KEY_KP0,
218 [ 1 ] = KEY_KP1,
219 [ 11 ] = KEY_KP2,
220 [ 27 ] = KEY_KP3,
221 [ 5 ] = KEY_KP4,
222 [ 9 ] = KEY_KP5,
223 [ 21 ] = KEY_KP6,
224 [ 6 ] = KEY_KP7,
225 [ 10 ] = KEY_KP8,
226 [ 18 ] = KEY_KP9,
227
228 [ 3 ] = KEY_TUNER, // TV/FM
229 [ 7 ] = KEY_SEARCH, // scan
230 [ 28 ] = KEY_ZOOM, // full screen
231 [ 30 ] = KEY_POWER,
232 [ 23 ] = KEY_VOLUMEDOWN,
233 [ 31 ] = KEY_VOLUMEUP,
234 [ 20 ] = KEY_CHANNELDOWN,
235 [ 22 ] = KEY_CHANNELUP,
236 [ 24 ] = KEY_MUTE,
237
238 [ 0 ] = KEY_LIST, // source
239 [ 19 ] = KEY_INFO, // loop
240 [ 16 ] = KEY_LAST, // +100
241 [ 13 ] = KEY_CLEAR, // reset
242 [ 12 ] = BTN_RIGHT, // fun++
243 [ 4 ] = BTN_LEFT, // fun--
244 [ 14 ] = KEY_GOTO, // function
245 [ 15 ] = KEY_STOP, // freeze
246};
247EXPORT_SYMBOL(ir_codes_pixelview);
248
216/* -------------------------------------------------------------------------- */ 249/* -------------------------------------------------------------------------- */
217 250
218static void ir_input_key_event(struct input_dev *dev, struct ir_input_state *ir) 251static void ir_input_key_event(struct input_dev *dev, struct ir_input_state *ir)