V4L/DVB (4643): Multi-input patch for DVB-USB device

This patch is the first commit of the Multiple Input Patch for the DVB-USB frame
work.
It changes the DVB-USB-device to be able to have more than one streaming input
(e.g. multiple DVB-T sources) on one device. This is a necessary feature for
the upcoming DiB7700 driven devices.

Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 26 insertions, 17 deletions

diff --git a/drivers/media/dvb/dvb-usb/nova-t-usb2.c b/drivers/media/dvb/dvb-usb/nova-t-usb2.c
index 79f0a02ce987..a9219bf69b89 100644
--- a/drivers/media/dvb/dvb-usb/nova-t-usb2.c
+++ b/drivers/media/dvb/dvb-usb/nova-t-usb2.c
@@ -135,7 +135,7 @@ static int nova_t_read_mac_address (struct dvb_usb_device *d, u8 mac[6])
 }
 
 /* USB Driver stuff */
-static struct dvb_usb_properties nova_t_properties;
+static struct dvb_usb_device_properties nova_t_properties;
 
 static int nova_t_probe(struct usb_interface *intf,
                 const struct usb_device_id *id)
@@ -151,34 +151,27 @@ static struct usb_device_id nova_t_table [] = {
 };
 MODULE_DEVICE_TABLE(usb, nova_t_table);
 
-static struct dvb_usb_properties nova_t_properties = {
-        .caps = DVB_USB_HAS_PID_FILTER | DVB_USB_PID_FILTER_CAN_BE_TURNED_OFF | DVB_USB_IS_AN_I2C_ADAPTER,
-        .pid_filter_count = 32,
+static struct dvb_usb_device_properties nova_t_properties = {
+        .caps = DVB_USB_IS_AN_I2C_ADAPTER,
 
         .usb_ctrl = CYPRESS_FX2,
         .firmware = "dvb-usb-nova-t-usb2-02.fw",
 
-        .size_of_priv     = sizeof(struct dibusb_state),
+        .num_adapters     = 1,
+        .adapter          = {
+                {
+                        .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF,
+                        .pid_filter_count = 32,
 
         .streaming_ctrl   = dibusb2_0_streaming_ctrl,
         .pid_filter       = dibusb_pid_filter,
         .pid_filter_ctrl  = dibusb_pid_filter_ctrl,
-        .power_ctrl       = dibusb2_0_power_ctrl,
         .frontend_attach  = dibusb_dib3000mc_frontend_attach,
         .tuner_attach     = dibusb_dib3000mc_tuner_attach,
-        .read_mac_address = nova_t_read_mac_address,
-
-        .rc_interval      = 100,
-        .rc_key_map       = haupp_rc_keys,
-        .rc_key_map_size  = ARRAY_SIZE(haupp_rc_keys),
-        .rc_query         = nova_t_rc_query,
 
-        .i2c_algo         = &dibusb_i2c_algo,
-
-        .generic_bulk_ctrl_endpoint = 0x01,
         /* parameter for the MPEG2-data transfer */
-        .urb = {
-                .type = DVB_USB_BULK,
+                        .stream = {
+                                .type = USB_BULK,
                 .count = 7,
                 .endpoint = 0x06,
                 .u = {
@@ -188,6 +181,22 @@ static struct dvb_usb_properties nova_t_properties = {
                 }
         },
 
+                        .size_of_priv     = sizeof(struct dibusb_state),
+                }
+        },
+
+        .power_ctrl       = dibusb2_0_power_ctrl,
+        .read_mac_address = nova_t_read_mac_address,
+
+        .rc_interval      = 100,
+        .rc_key_map       = haupp_rc_keys,
+        .rc_key_map_size  = ARRAY_SIZE(haupp_rc_keys),
+        .rc_query         = nova_t_rc_query,
+
+        .i2c_algo         = &dibusb_i2c_algo,
+
+        .generic_bulk_ctrl_endpoint = 0x01,
+
         .num_device_descs = 1,
         .devices = {
                 {   "Hauppauge WinTV-NOVA-T usb2",