diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-15 12:22:18 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-15 12:22:18 -0400 |
commit | 043fe50f8085c12651c96f04576eae4d8a22f3d8 (patch) | |
tree | 214b4f985ce7d3b1a4961620e2c2f4f5f06e1c35 /drivers/media/dvb/dvb-usb/m920x.c | |
parent | 227423904c709a8e60245c97081bbeb4fb500655 (diff) | |
parent | ea47689e74a1637fac4f5fc44890f3662c976849 (diff) |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (213 commits)
V4L/DVB (12720): em28xx-cards: Add vendor/product id for Kworld DVD Maker 2
V4L/DVB (12713): em28xx: Cleanups at ir_i2c handler
V4L/DVB (12712): em28xx: properly load ir-kbd-i2c when needed
V4L/DVB (12701): saa7134: ir-kbd-i2c init data needs a persistent object
V4L/DVB (12699): cx18: ir-kbd-i2c initialization data should point to a persistent object
V4L/DVB (12698): em28xx: ir-kbd-i2c init data needs a persistent object
V4L/DVB (12707): gspca - sn9c20x: Add SXGA support to MT9M111
V4L/DVB (12706): gspca - sn9c20x: disable exposure/gain controls for MT9M111 sensors.
V4L/DVB (12705): gspca - sn9c20x: Add SXGA support to SOI968
V4L/DVB (12703): gspca - sn9c20x: Reduces size of object
V4L/DVB (12704): gspca - sn9c20x: Fix exposure on SOI968 sensors
V4L/DVB (12696): gspca - sonixj / sn9c102: Two drivers for 0c45:60fc and 0c45:613e.
V4L/DVB (12695): gspca - vc032x: Do the LED work with the sensor hv7131r.
V4L/DVB (12694): gspca - vc032x: Change the start exchanges of the sensor hv7131r.
V4L/DVB (12693): gspca - sunplus: The brightness is signed.
V4L/DVB (12692): gspca - sunplus: Optimize code.
V4L/DVB (12691): gspca - sonixj: Don't use mdelay().
V4L/DVB (12690): gspca - pac7311: Webcam 06f8:3009 added.
V4L/DVB (12686): dvb-core: check supported QAM modulations
V4L/DVB (12685): dvb-core: check fe->ops.set_frontend return value
...
Diffstat (limited to 'drivers/media/dvb/dvb-usb/m920x.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/m920x.c | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/drivers/media/dvb/dvb-usb/m920x.c b/drivers/media/dvb/dvb-usb/m920x.c index 54626a0dbf68..aec7a1943b66 100644 --- a/drivers/media/dvb/dvb-usb/m920x.c +++ b/drivers/media/dvb/dvb-usb/m920x.c | |||
@@ -140,7 +140,7 @@ static int m920x_rc_query(struct dvb_usb_device *d, u32 *event, int *state) | |||
140 | goto unlock; | 140 | goto unlock; |
141 | 141 | ||
142 | for (i = 0; i < d->props.rc_key_map_size; i++) | 142 | for (i = 0; i < d->props.rc_key_map_size; i++) |
143 | if (d->props.rc_key_map[i].data == rc_state[1]) { | 143 | if (rc5_data(&d->props.rc_key_map[i]) == rc_state[1]) { |
144 | *event = d->props.rc_key_map[i].event; | 144 | *event = d->props.rc_key_map[i].event; |
145 | 145 | ||
146 | switch(rc_state[0]) { | 146 | switch(rc_state[0]) { |
@@ -562,42 +562,42 @@ static struct m920x_inits tvwalkertwin_rc_init [] = { | |||
562 | 562 | ||
563 | /* ir keymaps */ | 563 | /* ir keymaps */ |
564 | static struct dvb_usb_rc_key megasky_rc_keys [] = { | 564 | static struct dvb_usb_rc_key megasky_rc_keys [] = { |
565 | { 0x0, 0x12, KEY_POWER }, | 565 | { 0x0012, KEY_POWER }, |
566 | { 0x0, 0x1e, KEY_CYCLEWINDOWS }, /* min/max */ | 566 | { 0x001e, KEY_CYCLEWINDOWS }, /* min/max */ |
567 | { 0x0, 0x02, KEY_CHANNELUP }, | 567 | { 0x0002, KEY_CHANNELUP }, |
568 | { 0x0, 0x05, KEY_CHANNELDOWN }, | 568 | { 0x0005, KEY_CHANNELDOWN }, |
569 | { 0x0, 0x03, KEY_VOLUMEUP }, | 569 | { 0x0003, KEY_VOLUMEUP }, |
570 | { 0x0, 0x06, KEY_VOLUMEDOWN }, | 570 | { 0x0006, KEY_VOLUMEDOWN }, |
571 | { 0x0, 0x04, KEY_MUTE }, | 571 | { 0x0004, KEY_MUTE }, |
572 | { 0x0, 0x07, KEY_OK }, /* TS */ | 572 | { 0x0007, KEY_OK }, /* TS */ |
573 | { 0x0, 0x08, KEY_STOP }, | 573 | { 0x0008, KEY_STOP }, |
574 | { 0x0, 0x09, KEY_MENU }, /* swap */ | 574 | { 0x0009, KEY_MENU }, /* swap */ |
575 | { 0x0, 0x0a, KEY_REWIND }, | 575 | { 0x000a, KEY_REWIND }, |
576 | { 0x0, 0x1b, KEY_PAUSE }, | 576 | { 0x001b, KEY_PAUSE }, |
577 | { 0x0, 0x1f, KEY_FASTFORWARD }, | 577 | { 0x001f, KEY_FASTFORWARD }, |
578 | { 0x0, 0x0c, KEY_RECORD }, | 578 | { 0x000c, KEY_RECORD }, |
579 | { 0x0, 0x0d, KEY_CAMERA }, /* screenshot */ | 579 | { 0x000d, KEY_CAMERA }, /* screenshot */ |
580 | { 0x0, 0x0e, KEY_COFFEE }, /* "MTS" */ | 580 | { 0x000e, KEY_COFFEE }, /* "MTS" */ |
581 | }; | 581 | }; |
582 | 582 | ||
583 | static struct dvb_usb_rc_key tvwalkertwin_rc_keys [] = { | 583 | static struct dvb_usb_rc_key tvwalkertwin_rc_keys [] = { |
584 | { 0x0, 0x01, KEY_ZOOM }, /* Full Screen */ | 584 | { 0x0001, KEY_ZOOM }, /* Full Screen */ |
585 | { 0x0, 0x02, KEY_CAMERA }, /* snapshot */ | 585 | { 0x0002, KEY_CAMERA }, /* snapshot */ |
586 | { 0x0, 0x03, KEY_MUTE }, | 586 | { 0x0003, KEY_MUTE }, |
587 | { 0x0, 0x04, KEY_REWIND }, | 587 | { 0x0004, KEY_REWIND }, |
588 | { 0x0, 0x05, KEY_PLAYPAUSE }, /* Play/Pause */ | 588 | { 0x0005, KEY_PLAYPAUSE }, /* Play/Pause */ |
589 | { 0x0, 0x06, KEY_FASTFORWARD }, | 589 | { 0x0006, KEY_FASTFORWARD }, |
590 | { 0x0, 0x07, KEY_RECORD }, | 590 | { 0x0007, KEY_RECORD }, |
591 | { 0x0, 0x08, KEY_STOP }, | 591 | { 0x0008, KEY_STOP }, |
592 | { 0x0, 0x09, KEY_TIME }, /* Timeshift */ | 592 | { 0x0009, KEY_TIME }, /* Timeshift */ |
593 | { 0x0, 0x0c, KEY_COFFEE }, /* Recall */ | 593 | { 0x000c, KEY_COFFEE }, /* Recall */ |
594 | { 0x0, 0x0e, KEY_CHANNELUP }, | 594 | { 0x000e, KEY_CHANNELUP }, |
595 | { 0x0, 0x12, KEY_POWER }, | 595 | { 0x0012, KEY_POWER }, |
596 | { 0x0, 0x15, KEY_MENU }, /* source */ | 596 | { 0x0015, KEY_MENU }, /* source */ |
597 | { 0x0, 0x18, KEY_CYCLEWINDOWS }, /* TWIN PIP */ | 597 | { 0x0018, KEY_CYCLEWINDOWS }, /* TWIN PIP */ |
598 | { 0x0, 0x1a, KEY_CHANNELDOWN }, | 598 | { 0x001a, KEY_CHANNELDOWN }, |
599 | { 0x0, 0x1b, KEY_VOLUMEDOWN }, | 599 | { 0x001b, KEY_VOLUMEDOWN }, |
600 | { 0x0, 0x1e, KEY_VOLUMEUP }, | 600 | { 0x001e, KEY_VOLUMEUP }, |
601 | }; | 601 | }; |
602 | 602 | ||
603 | /* DVB USB Driver stuff */ | 603 | /* DVB USB Driver stuff */ |