Skip to content

Commit

Permalink
V4L/DVB (9231): cx23885: Define num_frontends as a function of the port
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Steven Toth authored and Mauro Carvalho Chehab committed Oct 17, 2008
1 parent d782ffa commit a739a7e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
7 changes: 7 additions & 0 deletions drivers/media/video/cx23885/cx23885-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions drivers/media/video/cx23885/cx23885.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit a739a7e

Please sign in to comment.