diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-01-24 10:18:41 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-22 18:24:08 -0400 |
commit | 76fd93b62322e5e4bfdf2744efe92f0de9e6ac4a (patch) | |
tree | 18fc1447471ff088f190a5f01baa7547884df67c /drivers/media/dvb | |
parent | 991bd3c25e8e07960ecd6bcc7079737f83f17c36 (diff) |
[media] opera1: Use multimedia keys instead of an app-specific mapping
This driver uses an app-specific keymap for one of the tables. This
is wrong. Instead, use the standard keycodes.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r-- | drivers/media/dvb/dvb-usb/opera1.c | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/drivers/media/dvb/dvb-usb/opera1.c b/drivers/media/dvb/dvb-usb/opera1.c index 1f1b7d6980a5..7e569f4dd80b 100644 --- a/drivers/media/dvb/dvb-usb/opera1.c +++ b/drivers/media/dvb/dvb-usb/opera1.c | |||
@@ -342,23 +342,22 @@ static struct rc_map_table rc_map_opera1_table[] = { | |||
342 | {0x49b6, KEY_8}, | 342 | {0x49b6, KEY_8}, |
343 | {0x05fa, KEY_9}, | 343 | {0x05fa, KEY_9}, |
344 | {0x45ba, KEY_0}, | 344 | {0x45ba, KEY_0}, |
345 | {0x09f6, KEY_UP}, /*chanup */ | 345 | {0x09f6, KEY_CHANNELUP}, /*chanup */ |
346 | {0x1be5, KEY_DOWN}, /*chandown */ | 346 | {0x1be5, KEY_CHANNELDOWN}, /*chandown */ |
347 | {0x5da3, KEY_LEFT}, /*voldown */ | 347 | {0x5da3, KEY_VOLUMEDOWN}, /*voldown */ |
348 | {0x5fa1, KEY_RIGHT}, /*volup */ | 348 | {0x5fa1, KEY_VOLUMEUP}, /*volup */ |
349 | {0x07f8, KEY_SPACE}, /*tab */ | 349 | {0x07f8, KEY_SPACE}, /*tab */ |
350 | {0x1fe1, KEY_ENTER}, /*play ok */ | 350 | {0x1fe1, KEY_OK}, /*play ok */ |
351 | {0x1be4, KEY_Z}, /*zoom */ | 351 | {0x1be4, KEY_ZOOM}, /*zoom */ |
352 | {0x59a6, KEY_M}, /*mute */ | 352 | {0x59a6, KEY_MUTE}, /*mute */ |
353 | {0x5ba5, KEY_F}, /*tv/f */ | 353 | {0x5ba5, KEY_RADIO}, /*tv/f */ |
354 | {0x19e7, KEY_R}, /*rec */ | 354 | {0x19e7, KEY_RECORD}, /*rec */ |
355 | {0x01fe, KEY_S}, /*Stop */ | 355 | {0x01fe, KEY_STOP}, /*Stop */ |
356 | {0x03fd, KEY_P}, /*pause */ | 356 | {0x03fd, KEY_PAUSE}, /*pause */ |
357 | {0x03fc, KEY_W}, /*<- -> */ | 357 | {0x03fc, KEY_SCREEN}, /*<- -> */ |
358 | {0x07f9, KEY_C}, /*capture */ | 358 | {0x07f9, KEY_CAMERA}, /*capture */ |
359 | {0x47b9, KEY_Q}, /*exit */ | 359 | {0x47b9, KEY_ESC}, /*exit */ |
360 | {0x43bc, KEY_O}, /*power */ | 360 | {0x43bc, KEY_POWER2}, /*power */ |
361 | |||
362 | }; | 361 | }; |
363 | 362 | ||
364 | static int opera1_rc_query(struct dvb_usb_device *dev, u32 * event, int *state) | 363 | static int opera1_rc_query(struct dvb_usb_device *dev, u32 * event, int *state) |