[PATCH] dvb: update core

From: Michael Hunold <hunold@linuxtv.org>

- demux: fix nasty bug where setting multiple filters resulted in ts
  packet duplication

- frontend: merge frontend improvements from 2.4 DVB tree:

  - schedule_timeout(1) in dvb_frontend.c after setting frontend and
    before waking up frontend thread

  - do FE_RESET in each iteration of frontend thread if !FE_HAS_LOCK

  - use aquire_signal flag to call FE_RESET only after tuning until
    FE_HAS_LOCK has been signalled, and not when FE_HAS_LOCK drops out for
    short periods of time later

- follow frontend changes in ves1x93 driver

diff --git a/drivers/media/dvb/dvb-core/dvb_demux.c b/drivers/media/dvb/dvb-core/dvb_demux.c
index ffb01c0912d648f850bdd0279eb71f6dec341ab2..6c640223da92d0423e25b43445112d3c7ef3bdad 100644 (file)
--- a/drivers/media/dvb/dvb-core/dvb_demux.c
+++ b/drivers/media/dvb/dvb-core/dvb_demux.c
@@ -395,17 +395,35 @@ static inline void dvb_dmx_swfilter_packet_type(struct dvb_demux_feed *feed, con
        }
 }
 
+#define DVR_FEED(f)                                                    \
+       (((f)->type == DMX_TYPE_TS) &&                                  \
+       ((f)->feed.ts.is_filtering) &&                                  \
+       (((f)->ts_type & (TS_PACKET|TS_PAYLOAD_ONLY)) == TS_PACKET))
 
 void dvb_dmx_swfilter_packet(struct dvb_demux *demux, const u8 *buf)
 {
        struct dvb_demux_feed *feed;
        struct list_head *pos, *head=&demux->feed_list;
        u16 pid = ts_pid(buf);
+       int dvr_done = 0;
 
        list_for_each(pos, head) {
                feed = list_entry(pos, struct dvb_demux_feed, list_head);
-               if (feed->pid == pid)
+
+               if ((feed->pid != pid) && (feed->pid != 0x2000))
+                       continue;
+
+               /* copy each packet only once to the dvr device, even
+                * if a PID is in multiple filters (e.g. video + PCR) */
+               if ((DVR_FEED(feed)) && (dvr_done++))
+                       continue;
+
+               if (feed->pid == pid) {
                        dvb_dmx_swfilter_packet_type (feed, buf);
+                       if (DVR_FEED(feed))
+                               continue;
+               }
+
                if (feed->pid == 0x2000)
                        feed->cb.ts(buf, 188, 0, 0, &feed->feed.ts, DMX_OK);
        }

diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index f5e38f1e1ba2614b0a8d9df163bb230b224badaa..256f2215b26ae2c3b4c03d16728375596de070f4 100644 (file)
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -67,6 +67,7 @@ struct dvb_frontend_data {
        pid_t thread_pid;
        unsigned long release_jiffies;
        unsigned long lost_sync_jiffies;
+       int aquire_signal;
        int bending;
        int lnb_drift;
        int timeout_count;
@@ -305,6 +306,7 @@ static int dvb_frontend_set_parameters (struct dvb_frontend_data *fe,
                fe->lost_sync_count = 0;
                fe->lost_sync_jiffies = jiffies;
                fe->lnb_drift = 0;
+               fe->aquire_signal = 1;
                if (fe->status & ~FE_TIMEDOUT)
                        dvb_frontend_add_event (fe, 0);
                memcpy (&fe->parameters, param,
@@ -364,6 +366,9 @@ static void update_delay (int *quality, int *delay, int locked)
  */
 static void dvb_frontend_recover (struct dvb_frontend_data *fe)
 {
+       int j = fe->lost_sync_count;
+       int stepsize;
+
        dprintk ("%s\n", __FUNCTION__);
 
 #if 0
@@ -383,10 +388,6 @@ static void dvb_frontend_recover (struct dvb_frontend_data *fe)
        /**
         *  let's start a zigzag scan to compensate LNB drift...
         */
-       {
-               int j = fe->lost_sync_count;
-               int stepsize;
-               
                if (fe->info->type == FE_QPSK)
                        stepsize = fe->parameters.u.qpsk.symbol_rate / 16000;
                else if (fe->info->type == FE_QAM)
@@ -403,7 +404,6 @@ static void dvb_frontend_recover (struct dvb_frontend_data *fe)
                }
 
                dvb_frontend_set_parameters (fe, &fe->parameters, 0);
-       }
 
        dvb_frontend_internal_ioctl (&fe->frontend, FE_RESET, NULL);
 }
@@ -467,13 +467,19 @@ static int dvb_frontend_thread (void *data)
                if (s & FE_HAS_LOCK) {
                        fe->timeout_count = 0;
                        fe->lost_sync_count = 0;
+                       fe->aquire_signal = 0;
                } else {
                        fe->lost_sync_count++;
                        if (!(fe->info->caps & FE_CAN_RECOVER)) {
                                if (!(fe->info->caps & FE_CAN_CLEAN_SETUP)) {
-                                       if (fe->lost_sync_count < 10)
+                                       if (fe->lost_sync_count < 10) {
+                                               if (fe->aquire_signal)
+                                                       dvb_frontend_internal_ioctl(
+                                                                       &fe->frontend,
+                                                                       FE_RESET, NULL);
                                                continue;
                                }
+                               }
                                dvb_frontend_recover (fe);
                                delay = HZ/5;
                        }
@@ -589,6 +595,9 @@ static int dvb_frontend_ioctl (struct inode *inode, struct file *file,
                break;
        case FE_SET_FRONTEND:
                err = dvb_frontend_set_parameters (fe, parg, 1);
+               set_current_state(TASK_INTERRUPTIBLE);
+               schedule_timeout(1);
+               wake_up_interruptible(&fe->wait_queue);
                break;
        case FE_GET_EVENT:
                err = dvb_frontend_get_event (fe, parg, file->f_flags);

diff --git a/drivers/media/dvb/frontends/ves1x93.c b/drivers/media/dvb/frontends/ves1x93.c
index 12410b1ea6934d78803ca2890eb89c221d19b94a..e6e6ba3fb458bfeb815109d1ec28e1648aa90ff3 100644 (file)
--- a/drivers/media/dvb/frontends/ves1x93.c
+++ b/drivers/media/dvb/frontends/ves1x93.c
@@ -395,9 +395,6 @@ static int ves1x93_set_symbolrate (struct dvb_i2c_bus *i2c, u32 srate)
        else
                ves1x93_writereg (i2c, 0x05, init_1x93_tab[0x05] & 0x7f);
 
-       ves1x93_writereg (i2c, 0x00, 0x00);
-       ves1x93_writereg (i2c, 0x00, 0x01);
-
        /* ves1993 hates this, will lose lock */
        if (demod_type != DEMOD_VES1993)
                ves1x93_clr_bit (i2c);