V4L/DVB (9231): cx23885: Define num_frontends as a function of the port

This allows some cardcoded functions to be more flexible, and paves
the way for any future cards that may have MFE support. Better to add it
now when the MFE patches is fresh in peoples mind, rather than 12 months
from now when new cards appear.

Signed-off-by: Steven Toth <stoth@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index 7f4b61297175c3409fcb5c82e165116be65e6b37..0979ba62e33af8951eacdd8c59d57079e38cdf85 100644 (file)
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -647,6 +647,13 @@ static int cx23885_init_tsport(struct cx23885_dev *dev, struct cx23885_tsport *p
        INIT_LIST_HEAD(&port->frontends.frontend.felist);
        port->frontends.active_fe_id = 0;
 
+       /* This should be hardcoded allow a single frontend
+        * attachment to this tsport, keeping the -dvb.c
+        * code clean and safe.
+        */
+       if(!port->num_frontends)
+               port->num_frontends = 1;
+
        switch(portno) {
        case 1:
                port->reg_gpcnt          = VID_B_GPCNT;

diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index aa34bf9ea4d97bcdbacb47e752b9630319729fc8..73d5d5756aefcbd436084c39c7ac77908a5e48da 100644 (file)
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -262,6 +262,9 @@ struct cx23885_tsport {
        u32                        src_sel_val;
        u32                        vld_misc_val;
        u32                        hw_sop_ctrl_val;
+
+       /* Allow a single tsport to have multiple frontends */
+       u32                        num_frontends;
 };
 
 struct cx23885_dev {