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>

1 files changed, 68 insertions, 48 deletions

diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index 22fc0a99f5ad..cd9f362c37b2 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -385,7 +385,7 @@ static int cxusb_d680_dmb_streaming_ctrl(
 
 static int cxusb_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 {
-        struct ir_scancode *keymap = d->props.rc_key_map;
+        struct ir_scancode *keymap = d->props.rc.legacy.rc_key_map;
         u8 ircode[4];
         int i;
 
@@ -394,7 +394,7 @@ static int cxusb_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
         *event = 0;
         *state = REMOTE_NO_KEY_PRESSED;
 
-        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]) == ircode[2] &&
                     rc5_data(&keymap[i]) == ircode[3]) {
                         *event = keymap[i].keycode;
@@ -410,7 +410,7 @@ static int cxusb_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
 static int cxusb_bluebird2_rc_query(struct dvb_usb_device *d, u32 *event,
                                     int *state)
 {
-        struct ir_scancode *keymap = d->props.rc_key_map;
+        struct ir_scancode *keymap = d->props.rc.legacy.rc_key_map;
         u8 ircode[4];
         int i;
         struct i2c_msg msg = { .addr = 0x6b, .flags = I2C_M_RD,
@@ -422,7 +422,7 @@ static int cxusb_bluebird2_rc_query(struct dvb_usb_device *d, u32 *event,
         if (cxusb_i2c_xfer(&d->i2c_adap, &msg, 1) != 1)
                 return 0;
 
-        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]) == ircode[1] &&
                     rc5_data(&keymap[i]) == ircode[2]) {
                         *event = keymap[i].keycode;
@@ -438,7 +438,7 @@ static int cxusb_bluebird2_rc_query(struct dvb_usb_device *d, u32 *event,
 static int cxusb_d680_dmb_rc_query(struct dvb_usb_device *d, u32 *event,
                 int *state)
 {
-        struct ir_scancode *keymap = d->props.rc_key_map;
+        struct ir_scancode *keymap = d->props.rc.legacy.rc_key_map;
         u8 ircode[2];
         int i;
 
@@ -448,7 +448,7 @@ static int cxusb_d680_dmb_rc_query(struct dvb_usb_device *d, u32 *event,
         if (cxusb_ctrl_msg(d, 0x10, NULL, 0, ircode, 2) < 0)
                 return 0;
 
-        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]) == ircode[0] &&
                     rc5_data(&keymap[i]) == ircode[1]) {
                         *event = keymap[i].keycode;
@@ -923,7 +923,7 @@ static int cxusb_dualdig4_frontend_attach(struct dvb_usb_adapter *adap)
                 return -EIO;
 
         /* try to determine if there is no IR decoder on the I2C bus */
-        for (i = 0; adap->dev->props.rc_key_map != NULL && i < 5; i++) {
+        for (i = 0; adap->dev->props.rc.legacy.rc_key_map != NULL && i < 5; i++) {
                 msleep(20);
                 if (cxusb_i2c_xfer(&adap->dev->i2c_adap, &msg, 1) != 1)
                         goto no_IR;
@@ -931,7 +931,7 @@ static int cxusb_dualdig4_frontend_attach(struct dvb_usb_adapter *adap)
                         continue;
                 if (ircode[2] + ircode[3] != 0xff) {
 no_IR:
-                        adap->dev->props.rc_key_map = NULL;
+                        adap->dev->props.rc.legacy.rc_key_map = NULL;
                         info("No IR receiver detected on this device.");
                         break;
                 }
@@ -1451,10 +1451,12 @@ static struct dvb_usb_device_properties cxusb_bluebird_lgh064f_properties = {
 
         .i2c_algo         = &cxusb_i2c_algo,
 
-        .rc_interval      = 100,
-        .rc_key_map       = ir_codes_dvico_portable_table,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_portable_table),
-        .rc_query         = cxusb_rc_query,
+        .rc.legacy = {
+                .rc_interval      = 100,
+                .rc_key_map       = ir_codes_dvico_portable_table,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_portable_table),
+                .rc_query         = cxusb_rc_query,
+        },
 
         .generic_bulk_ctrl_endpoint = 0x01,
 
@@ -1502,10 +1504,12 @@ static struct dvb_usb_device_properties cxusb_bluebird_dee1601_properties = {
 
         .i2c_algo         = &cxusb_i2c_algo,
 
-        .rc_interval      = 150,
-        .rc_key_map       = ir_codes_dvico_mce_table,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_mce_table),
-        .rc_query         = cxusb_rc_query,
+        .rc.legacy = {
+                .rc_interval      = 150,
+                .rc_key_map       = ir_codes_dvico_mce_table,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_mce_table),
+                .rc_query         = cxusb_rc_query,
+        },
 
         .generic_bulk_ctrl_endpoint = 0x01,
 
@@ -1561,10 +1565,12 @@ static struct dvb_usb_device_properties cxusb_bluebird_lgz201_properties = {
 
         .i2c_algo         = &cxusb_i2c_algo,
 
-        .rc_interval      = 100,
-        .rc_key_map       = ir_codes_dvico_portable_table,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_portable_table),
-        .rc_query         = cxusb_rc_query,
+        .rc.legacy = {
+                .rc_interval      = 100,
+                .rc_key_map       = ir_codes_dvico_portable_table,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_portable_table),
+                .rc_query         = cxusb_rc_query,
+        },
 
         .generic_bulk_ctrl_endpoint = 0x01,
         .num_device_descs = 1,
@@ -1611,10 +1617,12 @@ static struct dvb_usb_device_properties cxusb_bluebird_dtt7579_properties = {
 
         .i2c_algo         = &cxusb_i2c_algo,
 
-        .rc_interval      = 100,
-        .rc_key_map       = ir_codes_dvico_portable_table,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_portable_table),
-        .rc_query         = cxusb_rc_query,
+        .rc.legacy = {
+                .rc_interval      = 100,
+                .rc_key_map       = ir_codes_dvico_portable_table,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_portable_table),
+                .rc_query         = cxusb_rc_query,
+        },
 
         .generic_bulk_ctrl_endpoint = 0x01,
 
@@ -1660,10 +1668,12 @@ static struct dvb_usb_device_properties cxusb_bluebird_dualdig4_properties = {
 
         .generic_bulk_ctrl_endpoint = 0x01,
 
-        .rc_interval      = 100,
-        .rc_key_map       = ir_codes_dvico_mce_table,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_mce_table),
-        .rc_query         = cxusb_bluebird2_rc_query,
+        .rc.legacy = {
+                .rc_interval      = 100,
+                .rc_key_map       = ir_codes_dvico_mce_table,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_mce_table),
+                .rc_query         = cxusb_bluebird2_rc_query,
+        },
 
         .num_device_descs = 1,
         .devices = {
@@ -1708,10 +1718,12 @@ static struct dvb_usb_device_properties cxusb_bluebird_nano2_properties = {
 
         .generic_bulk_ctrl_endpoint = 0x01,
 
-        .rc_interval      = 100,
-        .rc_key_map       = ir_codes_dvico_portable_table,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_portable_table),
-        .rc_query         = cxusb_bluebird2_rc_query,
+        .rc.legacy = {
+                .rc_interval      = 100,
+                .rc_key_map       = ir_codes_dvico_portable_table,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_portable_table),
+                .rc_query         = cxusb_bluebird2_rc_query,
+        },
 
         .num_device_descs = 1,
         .devices = {
@@ -1758,10 +1770,12 @@ static struct dvb_usb_device_properties cxusb_bluebird_nano2_needsfirmware_prope
 
         .generic_bulk_ctrl_endpoint = 0x01,
 
-        .rc_interval      = 100,
-        .rc_key_map       = ir_codes_dvico_portable_table,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_portable_table),
-        .rc_query         = cxusb_rc_query,
+        .rc.legacy = {
+                .rc_interval      = 100,
+                .rc_key_map       = ir_codes_dvico_portable_table,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_portable_table),
+                .rc_query         = cxusb_rc_query,
+        },
 
         .num_device_descs = 1,
         .devices = {
@@ -1849,10 +1863,12 @@ struct dvb_usb_device_properties cxusb_bluebird_dualdig4_rev2_properties = {
 
         .generic_bulk_ctrl_endpoint = 0x01,
 
-        .rc_interval      = 100,
-        .rc_key_map       = ir_codes_dvico_mce_table,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_mce_table),
-        .rc_query         = cxusb_rc_query,
+        .rc.legacy = {
+                .rc_interval      = 100,
+                .rc_key_map       = ir_codes_dvico_mce_table,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_dvico_mce_table),
+                .rc_query         = cxusb_rc_query,
+        },
 
         .num_device_descs = 1,
         .devices = {
@@ -1897,10 +1913,12 @@ static struct dvb_usb_device_properties cxusb_d680_dmb_properties = {
 
         .generic_bulk_ctrl_endpoint = 0x01,
 
-        .rc_interval      = 100,
-        .rc_key_map       = ir_codes_d680_dmb_table,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_d680_dmb_table),
-        .rc_query         = cxusb_d680_dmb_rc_query,
+        .rc.legacy = {
+                .rc_interval      = 100,
+                .rc_key_map       = ir_codes_d680_dmb_table,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_d680_dmb_table),
+                .rc_query         = cxusb_d680_dmb_rc_query,
+        },
 
         .num_device_descs = 1,
         .devices = {
@@ -1946,10 +1964,12 @@ static struct dvb_usb_device_properties cxusb_mygica_d689_properties = {
 
         .generic_bulk_ctrl_endpoint = 0x01,
 
-        .rc_interval      = 100,
-        .rc_key_map       = ir_codes_d680_dmb_table,
-        .rc_key_map_size  = ARRAY_SIZE(ir_codes_d680_dmb_table),
-        .rc_query         = cxusb_d680_dmb_rc_query,
+        .rc.legacy = {
+                .rc_interval      = 100,
+                .rc_key_map       = ir_codes_d680_dmb_table,
+                .rc_key_map_size  = ARRAY_SIZE(ir_codes_d680_dmb_table),
+                .rc_query         = cxusb_d680_dmb_rc_query,
+        },
 
         .num_device_descs = 1,
         .devices = {