summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/dvb-usb/dib0700_core.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-07-31 18:04:09 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-08-02 16:43:45 -0300
commitf72a27b8ed4458bb9f7203408441d27382bc93f4 (patch)
tree667c20a22af36fecdfb770384afb3ef85a9578e2 /drivers/media/dvb/dvb-usb/dib0700_core.c
parent34abf2194499571b2efa6b4aface8c0ea0c47ce1 (diff)
downloadtalos-obmc-linux-f72a27b8ed4458bb9f7203408441d27382bc93f4.tar.gz
talos-obmc-linux-f72a27b8ed4458bb9f7203408441d27382bc93f4.zip
V4L/DVB: dvb-usb: prepare drivers for using rc-core
This is a big patch, yet trivial. It just move the RC properties to a separate struct, in order to prepare the dvb-usb drivers to use rc-core. There's no change on the behavior of the drivers. With this change, it is possible to have both legacy and rc-core based code inside the dvb-usb-remote, allowing a gradual migration to rc-core, driver per driver. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dib0700_core.c')
-rw-r--r--drivers/media/dvb/dvb-usb/dib0700_core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/dvb/dvb-usb/dib0700_core.c
index f761897eef3c..527b1e69df6c 100644
--- a/drivers/media/dvb/dvb-usb/dib0700_core.c
+++ b/drivers/media/dvb/dvb-usb/dib0700_core.c
@@ -510,7 +510,7 @@ static void dib0700_rc_urb_completion(struct urb *purb)
return;
}
- keymap = d->props.rc_key_map;
+ keymap = d->props.rc.legacy.rc_key_map;
st = d->priv;
buf = (u8 *)purb->transfer_buffer;
@@ -571,7 +571,7 @@ static void dib0700_rc_urb_completion(struct urb *purb)
poll_reply.system, poll_reply.data, poll_reply.not_data);
/* Find the key in the map */
- for (i = 0; i < d->props.rc_key_map_size; i++) {
+ for (i = 0; i < d->props.rc.legacy.rc_key_map_size; i++) {
if (rc5_custom(&keymap[i]) == (poll_reply.system & 0xff) &&
rc5_data(&keymap[i]) == poll_reply.data) {
event = keymap[i].keycode;
@@ -640,7 +640,7 @@ int dib0700_rc_setup(struct dvb_usb_device *d)
int ret;
int i;
- if (d->props.rc_key_map == NULL)
+ if (d->props.rc.legacy.rc_key_map == NULL)
return 0;
/* Set the IR mode */
OpenPOWER on IntegriCloud