V4L/DVB (9222): S2API: Add Multiple-frontend on a single adapter support.

A detailed description from the original patches 2 years ago:

"The WinTV-HVR3000 has a single transport bus which is shared between
a DVB-T and DVB-S modulator. These patches build on the bus acquisition
cx88 work from a few weeks ago to add support for this.

So to applications the HVR3000 looks like this:
/dev/dvb/adapter0/fe0 (cx24123 DVB-S demod)
/dev/dvb/adapter0/fe1 (cx22702 DVB-T demod)

Additional boards continue as before, eg:
/dev/dvb/adapter1/fe0 (lgdt3302 ATSC demod)

The basic change is removing the single instance of the videobuf_dvb in
cx8802_dev and saa7134_dev(?) and replacing it with a list and some
supporting functions.

*NOTE* This branch was taken before v4l-dvb was closed for 2.6.19 so
two or three current cx88 patches appear to be reversed by this tree,
this will be cleaned up in the near future. The patches missing change
the mutex handing to core->lock, fix an enumeration problem."

It should be recognised that a number of people have been maintaining
this patchset. Significant levels of Kudos to everyone one involved,
including but not limited to:

Darron Broad
Fabio M. Di Nitto
Carlo Scarfoglio
Hans Werner

Without the work of these people, and countless others, my two year old
patches would of died on the Mercurial linuxtv.org vine a long time
ago.

TODO: Revise these patches a little further so that the need for
demux1 and dvr0 is optional, not mandatory on the HVR3000.

HISTORY (darron):
This is the last update to MFE prepared by Hans which is based
upon the `scratchpad' diff created by Carlo.
All MFE work prior to that point must be attributed to Fabio
who ported and maintained Steve's original patch up to that
time.

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

2 files changed, 14 insertions, 11 deletions

diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 72ce7935f253..26671757c70b 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -212,8 +212,9 @@ static int dvb_frontend_get_event(struct dvb_frontend *fe,
 
 static void dvb_frontend_init(struct dvb_frontend *fe)
 {
-        dprintk ("DVB: initialising frontend %i (%s)...\n",
+        dprintk ("DVB: initialising adapter %i frontend %i (%s)...\n",
                  fe->dvb->num,
+                 fe->id,
                  fe->ops.info.name);
 
         if (fe->ops.init)
@@ -686,7 +687,7 @@ static int dvb_frontend_start(struct dvb_frontend *fe)
         mb();
 
         fe_thread = kthread_run(dvb_frontend_thread, fe,
-                "kdvb-fe-%i", fe->dvb->num);
+                "kdvb-ad-%i-fe-%i", fe->dvb->num,fe->id);
         if (IS_ERR(fe_thread)) {
                 ret = PTR_ERR(fe_thread);
                 printk("dvb_frontend_start: failed to start kthread (%d)\n", ret);
@@ -710,8 +711,8 @@ static void dvb_frontend_get_frequeny_limits(struct dvb_frontend *fe,
                 *freq_max = min(fe->ops.info.frequency_max, fe->ops.tuner_ops.info.frequency_max);
 
         if (*freq_min == 0 || *freq_max == 0)
-                printk(KERN_WARNING "DVB: frontend %u frequency limits undefined - fix the driver\n",
-                       fe->dvb->num);
+                printk(KERN_WARNING "DVB: adapter %i frontend %u frequency limits undefined - fix the driver\n",
+                       fe->dvb->num,fe->id);
 }
 
 static int dvb_frontend_check_parameters(struct dvb_frontend *fe,
@@ -724,8 +725,8 @@ static int dvb_frontend_check_parameters(struct dvb_frontend *fe,
         dvb_frontend_get_frequeny_limits(fe, &freq_min, &freq_max);
         if ((freq_min && parms->frequency < freq_min) ||
             (freq_max && parms->frequency > freq_max)) {
-                printk(KERN_WARNING "DVB: frontend %u frequency %u out of range (%u..%u)\n",
-                       fe->dvb->num, parms->frequency, freq_min, freq_max);
+                printk(KERN_WARNING "DVB: adapter %i frontend %i frequency %u out of range (%u..%u)\n",
+                       fe->dvb->num, fe->id, parms->frequency, freq_min, freq_max);
                 return -EINVAL;
         }
 
@@ -735,8 +736,8 @@ static int dvb_frontend_check_parameters(struct dvb_frontend *fe,
                      parms->u.qpsk.symbol_rate < fe->ops.info.symbol_rate_min) ||
                     (fe->ops.info.symbol_rate_max &&
                      parms->u.qpsk.symbol_rate > fe->ops.info.symbol_rate_max)) {
-                        printk(KERN_WARNING "DVB: frontend %u symbol rate %u out of range (%u..%u)\n",
-                               fe->dvb->num, parms->u.qpsk.symbol_rate,
+                        printk(KERN_WARNING "DVB: adapter %i frontend %i symbol rate %u out of range (%u..%u)\n",
+                               fe->dvb->num, fe->id, parms->u.qpsk.symbol_rate,
                                fe->ops.info.symbol_rate_min, fe->ops.info.symbol_rate_max);
                         return -EINVAL;
                 }
@@ -746,8 +747,8 @@ static int dvb_frontend_check_parameters(struct dvb_frontend *fe,
                      parms->u.qam.symbol_rate < fe->ops.info.symbol_rate_min) ||
                     (fe->ops.info.symbol_rate_max &&
                      parms->u.qam.symbol_rate > fe->ops.info.symbol_rate_max)) {
-                        printk(KERN_WARNING "DVB: frontend %u symbol rate %u out of range (%u..%u)\n",
-                               fe->dvb->num, parms->u.qam.symbol_rate,
+                        printk(KERN_WARNING "DVB: adapter %i frontend %i symbol rate %u out of range (%u..%u)\n",
+                               fe->dvb->num, fe->id, parms->u.qam.symbol_rate,
                                fe->ops.info.symbol_rate_min, fe->ops.info.symbol_rate_max);
                         return -EINVAL;
                 }
@@ -1807,8 +1808,9 @@ int dvb_register_frontend(struct dvb_adapter* dvb,
         fe->dvb = dvb;
         fepriv->inversion = INVERSION_OFF;
 
-        printk ("DVB: registering frontend %i (%s)...\n",
+        printk ("DVB: registering adapter %i frontend %i (%s)...\n",
                 fe->dvb->num,
+                fe->id,
                 fe->ops.info.name);
 
         dvb_register_device (fe->dvb, &fepriv->dvbdev, &dvbdev_template,
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h
index 3055301ff3ca..db4a63b0a32e 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -222,6 +222,7 @@ struct dvb_frontend {
         struct dtv_frontend_properties dtv_property_cache;
 #define DVB_FRONTEND_COMPONENT_TUNER 0
         int (*callback)(void *adapter_priv, int component, int cmd, int arg);
+        int id;
 };
 
 extern int dvb_register_frontend(struct dvb_adapter *dvb,