The patch number 9231 was added via Steven Toth <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Steven Toth <[EMAIL PROTECTED]>
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.
Priority: normal
Signed-off-by: Steven Toth <[EMAIL PROTECTED]>
---
linux/drivers/media/video/cx23885/cx23885-core.c | 7 +++++++
linux/drivers/media/video/cx23885/cx23885.h | 3 +++
2 files changed, 10 insertions(+)
diff -r 1b2771d04046 -r f5764f2068fc
linux/drivers/media/video/cx23885/cx23885-core.c
--- a/linux/drivers/media/video/cx23885/cx23885-core.c Sat Oct 11 11:25:25
2008 -0400
+++ b/linux/drivers/media/video/cx23885/cx23885-core.c Sat Oct 11 11:27:06
2008 -0400
@@ -648,6 +648,13 @@ static int cx23885_init_tsport(struct cx
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 -r 1b2771d04046 -r f5764f2068fc linux/drivers/media/video/cx23885/cx23885.h
--- a/linux/drivers/media/video/cx23885/cx23885.h Sat Oct 11 11:25:25
2008 -0400
+++ b/linux/drivers/media/video/cx23885/cx23885.h Sat Oct 11 11:27:06
2008 -0400
@@ -263,6 +263,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 {
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/f5764f2068fcbfc6de7a10e9eace1127937b1a94
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
