drivers/media/dvb/dvb-core/dvb_demux.c

   1 /*
   2  * dvb_demux.c - DVB kernel demux API
   3  *
   4  * Copyright (C) 2000-2001 Ralph  Metzler <ralph@convergence.de>
   5  *                     & Marcus Metzler <marcus@convergence.de>
   6  *                       for convergence integrated media GmbH
   7  *
   8  * This program is free software; you can redistribute it and/or
   9  * modify it under the terms of the GNU Lesser General Public License
  10  * as published by the Free Software Foundation; either version 2.1
  11  * of the License, or (at your option) any later version.
  12  *
  13  * This program is distributed in the hope that it will be useful,
  14  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  15  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  16  * GNU General Public License for more details.
  17  *
  18  * You should have received a copy of the GNU Lesser General Public License
  19  * along with this program; if not, write to the Free Software
  20  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  21  *
  22  */
  23
  24 #include <linux/sched.h>
  25 #include <linux/spinlock.h>
  26 #include <linux/slab.h>
  27 #include <linux/vmalloc.h>
  28 #include <linux/module.h>
  29 #include <linux/poll.h>
  30 #include <linux/string.h>
  31 #include <linux/crc32.h>
  32 #include <asm/uaccess.h>
  33 #include <asm/div64.h>
  34
  35 #include "dvb_demux.h"
  36
  37 #define NOBUFS
  38 /*
  39 ** #define DVB_DEMUX_SECTION_LOSS_LOG to monitor payload loss in the syslog
  40 */
  41 // #define DVB_DEMUX_SECTION_LOSS_LOG
  42
  43 static int dvb_demux_tscheck;
  44 module_param(dvb_demux_tscheck, int, 0644);
  45 MODULE_PARM_DESC(dvb_demux_tscheck,
  46                 "enable transport stream continuity and TEI check");
  47
  48 static int dvb_demux_speedcheck;
  49 module_param(dvb_demux_speedcheck, int, 0644);
  50 MODULE_PARM_DESC(dvb_demux_speedcheck,
  51                 "enable transport stream speed check");
  52
  53 #define dprintk_tscheck(x...) do {                              \
  54                 if (dvb_demux_tscheck && printk_ratelimit())    \
  55                         printk(x);                              \
  56         } while (0)
  57
  58 /******************************************************************************
  59  * static inlined helper functions
  60  ******************************************************************************/
  61
  62 static inline u16 section_length(const u8 *buf)
  63 {
  64         return 3 + ((buf[1] & 0x0f) << 8) + buf[2];
  65 }
  66
  67 static inline u16 ts_pid(const u8 *buf)
  68 {
  69         return ((buf[1] & 0x1f) << 8) + buf[2];
  70 }
  71
  72 static inline u8 payload(const u8 *tsp)
  73 {
  74         if (!(tsp[3] & 0x10))   // no payload?
  75                 return 0;
  76
  77         if (tsp[3] & 0x20) {    // adaptation field?
  78                 if (tsp[4] > 183)       // corrupted data?
  79                         return 0;
  80                 else
  81                         return 184 - 1 - tsp[4];
  82         }
  83
  84         return 184;
  85 }
  86
  87 static u32 dvb_dmx_crc32(struct dvb_demux_feed *f, const u8 *src, size_t len)
  88 {
  89         return (f->feed.sec.crc_val = crc32_be(f->feed.sec.crc_val, src, len));
  90 }
  91
  92 static void dvb_dmx_memcopy(struct dvb_demux_feed *f, u8 *d, const u8 *s,
  93                             size_t len)
  94 {
  95         memcpy(d, s, len);
  96 }
  97
  98 /******************************************************************************
  99  * Software filter functions
 100  ******************************************************************************/
 101
 102 static inline int dvb_dmx_swfilter_payload(struct dvb_demux_feed *feed,
 103                                            const u8 *buf)
 104 {
 105         int count = payload(buf);
 106         int p;
 107         //int ccok;
 108         //u8 cc;
 109
 110         if (count == 0)
 111                 return -1;
 112
 113         p = 188 - count;
 114
 115         /*
 116         cc = buf[3] & 0x0f;
 117         ccok = ((feed->cc + 1) & 0x0f) == cc;
 118         feed->cc = cc;
 119         if (!ccok)
 120                 printk("missed packet!\n");
 121         */
 122
 123         if (buf[1] & 0x40)      // PUSI ?
 124                 feed->peslen = 0xfffa;
 125
 126         feed->peslen += count;
 127
 128         return feed->cb.ts(&buf[p], count, NULL, 0, &feed->feed.ts, DMX_OK);
 129 }
 130
 131 static int dvb_dmx_swfilter_sectionfilter(struct dvb_demux_feed *feed,
 132                                           struct dvb_demux_filter *f)
 133 {
 134         u8 neq = 0;
 135         int i;
 136
 137         for (i = 0; i < DVB_DEMUX_MASK_MAX; i++) {
 138                 u8 xor = f->filter.filter_value[i] ^ feed->feed.sec.secbuf[i];
 139
 140                 if (f->maskandmode[i] & xor)
 141                         return 0;
 142
 143                 neq |= f->maskandnotmode[i] & xor;
 144         }
 145
 146         if (f->doneq && !neq)
 147                 return 0;
 148
 149         return feed->cb.sec(feed->feed.sec.secbuf, feed->feed.sec.seclen,
 150                             NULL, 0, &f->filter, DMX_OK);
 151 }
 152
 153 static inline int dvb_dmx_swfilter_section_feed(struct dvb_demux_feed *feed)
 154 {
 155         struct dvb_demux *demux = feed->demux;
 156         struct dvb_demux_filter *f = feed->filter;
 157         struct dmx_section_feed *sec = &feed->feed.sec;
 158         int section_syntax_indicator;
 159
 160         if (!sec->is_filtering)
 161                 return 0;
 162
 163         if (!f)
 164                 return 0;
 165
 166         if (sec->check_crc) {
 167                 section_syntax_indicator = ((sec->secbuf[1] & 0x80) != 0);
 168                 if (section_syntax_indicator &&
 169                     demux->check_crc32(feed, sec->secbuf, sec->seclen))
 170                         return -1;
 171         }
 172
 173         do {
 174                 if (dvb_dmx_swfilter_sectionfilter(feed, f) < 0)
 175                         return -1;
 176         } while ((f = f->next) && sec->is_filtering);
 177
 178         sec->seclen = 0;
 179
 180         return 0;
 181 }
 182
 183 static void dvb_dmx_swfilter_section_new(struct dvb_demux_feed *feed)
 184 {
 185         struct dmx_section_feed *sec = &feed->feed.sec;
 186
 187 #ifdef DVB_DEMUX_SECTION_LOSS_LOG
 188         if (sec->secbufp < sec->tsfeedp) {
 189                 int i, n = sec->tsfeedp - sec->secbufp;
 190
 191                 /*
 192                  * Section padding is done with 0xff bytes entirely.
 193                  * Due to speed reasons, we won't check all of them
 194                  * but just first and last.
 195                  */
 196                 if (sec->secbuf[0] != 0xff || sec->secbuf[n - 1] != 0xff) {
 197                         printk("dvb_demux.c section ts padding loss: %d/%d\n",
 198                                n, sec->tsfeedp);
 199                         printk("dvb_demux.c pad data:");
 200                         for (i = 0; i < n; i++)
 201                                 printk(" %02x", sec->secbuf[i]);
 202                         printk("\n");
 203                 }
 204         }
 205 #endif
 206
 207         sec->tsfeedp = sec->secbufp = sec->seclen = 0;
 208         sec->secbuf = sec->secbuf_base;
 209 }
 210
 211 /*
 212  * Losless Section Demux 1.4.1 by Emard
 213  * Valsecchi Patrick:
 214  *  - middle of section A  (no PUSI)
 215  *  - end of section A and start of section B
 216  *    (with PUSI pointing to the start of the second section)
 217  *
 218  *  In this case, without feed->pusi_seen you'll receive a garbage section
 219  *  consisting of the end of section A. Basically because tsfeedp
 220  *  is incemented and the use=0 condition is not raised
 221  *  when the second packet arrives.
 222  *
 223  * Fix:
 224  * when demux is started, let feed->pusi_seen = 0 to
 225  * prevent initial feeding of garbage from the end of
 226  * previous section. When you for the first time see PUSI=1
 227  * then set feed->pusi_seen = 1
 228  */
 229 static int dvb_dmx_swfilter_section_copy_dump(struct dvb_demux_feed *feed,
 230                                               const u8 *buf, u8 len)
 231 {
 232         struct dvb_demux *demux = feed->demux;
 233         struct dmx_section_feed *sec = &feed->feed.sec;
 234         u16 limit, seclen, n;
 235
 236         if (sec->tsfeedp >= DMX_MAX_SECFEED_SIZE)
 237                 return 0;
 238
 239         if (sec->tsfeedp + len > DMX_MAX_SECFEED_SIZE) {
 240 #ifdef DVB_DEMUX_SECTION_LOSS_LOG
 241                 printk("dvb_demux.c section buffer full loss: %d/%d\n",
 242                        sec->tsfeedp + len - DMX_MAX_SECFEED_SIZE,
 243                        DMX_MAX_SECFEED_SIZE);
 244 #endif
 245                 len = DMX_MAX_SECFEED_SIZE - sec->tsfeedp;
 246         }
 247
 248         if (len <= 0)
 249                 return 0;
 250
 251         demux->memcopy(feed, sec->secbuf_base + sec->tsfeedp, buf, len);
 252         sec->tsfeedp += len;
 253
 254         /*
 255          * Dump all the sections we can find in the data (Emard)
 256          */
 257         limit = sec->tsfeedp;
 258         if (limit > DMX_MAX_SECFEED_SIZE)
 259                 return -1;      /* internal error should never happen */
 260
 261         /* to be sure always set secbuf */
 262         sec->secbuf = sec->secbuf_base + sec->secbufp;
 263
 264         for (n = 0; sec->secbufp + 2 < limit; n++) {
 265                 seclen = section_length(sec->secbuf);
 266                 if (seclen <= 0 || seclen > DMX_MAX_SECTION_SIZE
 267                     || seclen + sec->secbufp > limit)
 268                         return 0;
 269                 sec->seclen = seclen;
 270                 sec->crc_val = ~0;
 271                 /* dump [secbuf .. secbuf+seclen) */
 272                 if (feed->pusi_seen)
 273                         dvb_dmx_swfilter_section_feed(feed);
 274 #ifdef DVB_DEMUX_SECTION_LOSS_LOG
 275                 else
 276                         printk("dvb_demux.c pusi not seen, discarding section data\n");
 277 #endif
 278                 sec->secbufp += seclen; /* secbufp and secbuf moving together is */
 279                 sec->secbuf += seclen;  /* redundant but saves pointer arithmetic */
 280         }
 281
 282         return 0;
 283 }
 284
 285 static int dvb_dmx_swfilter_section_packet(struct dvb_demux_feed *feed,
 286                                            const u8 *buf)
 287 {
 288         u8 p, count;
 289         int ccok, dc_i = 0;
 290         u8 cc;
 291
 292         count = payload(buf);
 293
 294         if (count == 0)         /* count == 0 if no payload or out of range */
 295                 return -1;
 296
 297         p = 188 - count;        /* payload start */
 298
 299         cc = buf[3] & 0x0f;
 300         ccok = ((feed->cc + 1) & 0x0f) == cc;
 301         feed->cc = cc;
 302
 303         if (buf[3] & 0x20) {
 304                 /* adaption field present, check for discontinuity_indicator */
 305                 if ((buf[4] > 0) && (buf[5] & 0x80))
 306                         dc_i = 1;
 307         }
 308
 309         if (!ccok || dc_i) {
 310 #ifdef DVB_DEMUX_SECTION_LOSS_LOG
 311                 printk("dvb_demux.c discontinuity detected %d bytes lost\n",
 312                        count);
 313                 /*
 314                  * those bytes under sume circumstances will again be reported
 315                  * in the following dvb_dmx_swfilter_section_new
 316                  */
 317 #endif
 318                 /*
 319                  * Discontinuity detected. Reset pusi_seen = 0 to
 320                  * stop feeding of suspicious data until next PUSI=1 arrives
 321                  */
 322                 feed->pusi_seen = 0;
 323                 dvb_dmx_swfilter_section_new(feed);
 324         }
 325
 326         if (buf[1] & 0x40) {
 327                 /* PUSI=1 (is set), section boundary is here */
 328                 if (count > 1 && buf[p] < count) {
 329                         const u8 *before = &buf[p + 1];
 330                         u8 before_len = buf[p];
 331                         const u8 *after = &before[before_len];
 332                         u8 after_len = count - 1 - before_len;
 333
 334                         dvb_dmx_swfilter_section_copy_dump(feed, before,
 335                                                            before_len);
 336                         /* before start of new section, set pusi_seen = 1 */
 337                         feed->pusi_seen = 1;
 338                         dvb_dmx_swfilter_section_new(feed);
 339                         dvb_dmx_swfilter_section_copy_dump(feed, after,
 340                                                            after_len);
 341                 }
 342 #ifdef DVB_DEMUX_SECTION_LOSS_LOG
 343                 else if (count > 0)
 344                         printk("dvb_demux.c PUSI=1 but %d bytes lost\n", count);
 345 #endif
 346         } else {
 347                 /* PUSI=0 (is not set), no section boundary */
 348                 dvb_dmx_swfilter_section_copy_dump(feed, &buf[p], count);
 349         }
 350
 351         return 0;
 352 }
 353
 354 static inline void dvb_dmx_swfilter_packet_type(struct dvb_demux_feed *feed,
 355                                                 const u8 *buf)
 356 {
 357         switch (feed->type) {
 358         case DMX_TYPE_TS:
 359                 if (!feed->feed.ts.is_filtering)
 360                         break;
 361                 if (feed->ts_type & TS_PACKET) {
 362                         if (feed->ts_type & TS_PAYLOAD_ONLY)
 363                                 dvb_dmx_swfilter_payload(feed, buf);
 364                         else
 365                                 feed->cb.ts(buf, 188, NULL, 0, &feed->feed.ts,
 366                                             DMX_OK);
 367                 }
 368                 if (feed->ts_type & TS_DECODER)
 369                         if (feed->demux->write_to_decoder)
 370                                 feed->demux->write_to_decoder(feed, buf, 188);
 371                 break;
 372
 373         case DMX_TYPE_SEC:
 374                 if (!feed->feed.sec.is_filtering)
 375                         break;
 376                 if (dvb_dmx_swfilter_section_packet(feed, buf) < 0)
 377                         feed->feed.sec.seclen = feed->feed.sec.secbufp = 0;
 378                 break;
 379
 380         default:
 381                 break;
 382         }
 383 }
 384
 385 #define DVR_FEED(f)                                                     \
 386         (((f)->type == DMX_TYPE_TS) &&                                  \
 387         ((f)->feed.ts.is_filtering) &&                                  \
 388         (((f)->ts_type & (TS_PACKET | TS_DEMUX)) == TS_PACKET))
 389
 390 static void dvb_dmx_swfilter_packet(struct dvb_demux *demux, const u8 *buf)
 391 {
 392         struct dvb_demux_feed *feed;
 393         u16 pid = ts_pid(buf);
 394         int dvr_done = 0;
 395
 396         if (dvb_demux_speedcheck) {
 397                 struct timespec cur_time, delta_time;
 398                 u64 speed_bytes, speed_timedelta;
 399
 400                 demux->speed_pkts_cnt++;
 401
 402                 /* show speed every SPEED_PKTS_INTERVAL packets */
 403                 if (!(demux->speed_pkts_cnt % SPEED_PKTS_INTERVAL)) {
 404                         cur_time = current_kernel_time();
 405
 406                         if (demux->speed_last_time.tv_sec != 0 &&
 407                                         demux->speed_last_time.tv_nsec != 0) {
 408                                 delta_time = timespec_sub(cur_time,
 409                                                 demux->speed_last_time);
 410                                 speed_bytes = (u64)demux->speed_pkts_cnt
 411                                         * 188 * 8;
 412                                 /* convert to 1024 basis */
 413                                 speed_bytes = 1000 * div64_u64(speed_bytes,
 414                                                 1024);
 415                                 speed_timedelta =
 416                                         (u64)timespec_to_ns(&delta_time);
 417                                 speed_timedelta = div64_u64(speed_timedelta,
 418                                                 1000000); /* nsec -> usec */
 419                                 printk(KERN_INFO "TS speed %llu Kbits/sec \n",
 420                                                 div64_u64(speed_bytes,
 421                                                         speed_timedelta));
 422                         };
 423
 424                         demux->speed_last_time = cur_time;
 425                         demux->speed_pkts_cnt = 0;
 426                 };
 427         };
 428
 429         if (dvb_demux_tscheck) {
 430                 if (!demux->cnt_storage)
 431                         demux->cnt_storage = vmalloc(MAX_PID + 1);
 432
 433                 if (!demux->cnt_storage) {
 434                         printk(KERN_WARNING "Couldn't allocate memory for TS/TEI check. Disabling it\n");
 435                         dvb_demux_tscheck = 0;
 436                         goto no_dvb_demux_tscheck;
 437                 }
 438
 439                 /* check pkt counter */
 440                 if (pid < MAX_PID) {
 441                         if (buf[1] & 0x80)
 442                                 dprintk_tscheck("TEI detected. "
 443                                                 "PID=0x%x data1=0x%x\n",
 444                                                 pid, buf[1]);
 445
 446                         if ((buf[3] & 0xf) != demux->cnt_storage[pid])
 447                                 dprintk_tscheck("TS packet counter mismatch. "
 448                                                 "PID=0x%x expected 0x%x "
 449                                                 "got 0x%x\n",
 450                                                 pid, demux->cnt_storage[pid],
 451                                                 buf[3] & 0xf);
 452
 453                         demux->cnt_storage[pid] = ((buf[3] & 0xf) + 1)&0xf;
 454                 };
 455                 /* end check */
 456         };
 457 no_dvb_demux_tscheck:
 458
 459         list_for_each_entry(feed, &demux->feed_list, list_head) {
 460                 if ((feed->pid != pid) && (feed->pid != 0x2000))
 461                         continue;
 462
 463                 /* copy each packet only once to the dvr device, even
 464                  * if a PID is in multiple filters (e.g. video + PCR) */
 465                 if ((DVR_FEED(feed)) && (dvr_done++))
 466                         continue;
 467
 468                 if (feed->pid == pid)
 469                         dvb_dmx_swfilter_packet_type(feed, buf);
 470                 else if (feed->pid == 0x2000)
 471                         feed->cb.ts(buf, 188, NULL, 0, &feed->feed.ts, DMX_OK);
 472         }
 473 }
 474
 475 void dvb_dmx_swfilter_packets(struct dvb_demux *demux, const u8 *buf,
 476                               size_t count)
 477 {
 478         spin_lock(&demux->lock);
 479
 480         while (count--) {
 481                 if (buf[0] == 0x47)
 482                         dvb_dmx_swfilter_packet(demux, buf);
 483                 buf += 188;
 484         }
 485
 486         spin_unlock(&demux->lock);
 487 }
 488
 489 EXPORT_SYMBOL(dvb_dmx_swfilter_packets);
 490
 491 void dvb_dmx_swfilter(struct dvb_demux *demux, const u8 *buf, size_t count)
 492 {
 493         int p = 0, i, j;
 494
 495         spin_lock(&demux->lock);
 496
 497         if (demux->tsbufp) {
 498                 i = demux->tsbufp;
 499                 j = 188 - i;
 500                 if (count < j) {
 501                         memcpy(&demux->tsbuf[i], buf, count);
 502                         demux->tsbufp += count;
 503                         goto bailout;
 504                 }
 505                 memcpy(&demux->tsbuf[i], buf, j);
 506                 if (demux->tsbuf[0] == 0x47)
 507                         dvb_dmx_swfilter_packet(demux, demux->tsbuf);
 508                 demux->tsbufp = 0;
 509                 p += j;
 510         }
 511
 512         while (p < count) {
 513                 if (buf[p] == 0x47) {
 514                         if (count - p >= 188) {
 515                                 dvb_dmx_swfilter_packet(demux, &buf[p]);
 516                                 p += 188;
 517                         } else {
 518                                 i = count - p;
 519                                 memcpy(demux->tsbuf, &buf[p], i);
 520                                 demux->tsbufp = i;
 521                                 goto bailout;
 522                         }
 523                 } else
 524                         p++;
 525         }
 526
 527 bailout:
 528         spin_unlock(&demux->lock);
 529 }
 530
 531 EXPORT_SYMBOL(dvb_dmx_swfilter);
 532
 533 void dvb_dmx_swfilter_204(struct dvb_demux *demux, const u8 *buf, size_t count)
 534 {
 535         int p = 0, i, j;
 536         u8 tmppack[188];
 537
 538         spin_lock(&demux->lock);
 539
 540         if (demux->tsbufp) {
 541                 i = demux->tsbufp;
 542                 j = 204 - i;
 543                 if (count < j) {
 544                         memcpy(&demux->tsbuf[i], buf, count);
 545                         demux->tsbufp += count;
 546                         goto bailout;
 547                 }
 548                 memcpy(&demux->tsbuf[i], buf, j);
 549                 if ((demux->tsbuf[0] == 0x47) || (demux->tsbuf[0] == 0xB8)) {
 550                         memcpy(tmppack, demux->tsbuf, 188);
 551                         if (tmppack[0] == 0xB8)
 552                                 tmppack[0] = 0x47;
 553                         dvb_dmx_swfilter_packet(demux, tmppack);
 554                 }
 555                 demux->tsbufp = 0;
 556                 p += j;
 557         }
 558
 559         while (p < count) {
 560                 if ((buf[p] == 0x47) || (buf[p] == 0xB8)) {
 561                         if (count - p >= 204) {
 562                                 memcpy(tmppack, &buf[p], 188);
 563                                 if (tmppack[0] == 0xB8)
 564                                         tmppack[0] = 0x47;
 565                                 dvb_dmx_swfilter_packet(demux, tmppack);
 566                                 p += 204;
 567                         } else {
 568                                 i = count - p;
 569                                 memcpy(demux->tsbuf, &buf[p], i);
 570                                 demux->tsbufp = i;
 571                                 goto bailout;
 572                         }
 573                 } else {
 574                         p++;
 575                 }
 576         }
 577
 578 bailout:
 579         spin_unlock(&demux->lock);
 580 }
 581
 582 EXPORT_SYMBOL(dvb_dmx_swfilter_204);
 583
 584 static struct dvb_demux_filter *dvb_dmx_filter_alloc(struct dvb_demux *demux)
 585 {
 586         int i;
 587
 588         for (i = 0; i < demux->filternum; i++)
 589                 if (demux->filter[i].state == DMX_STATE_FREE)
 590                         break;
 591
 592         if (i == demux->filternum)
 593                 return NULL;
 594
 595         demux->filter[i].state = DMX_STATE_ALLOCATED;
 596
 597         return &demux->filter[i];
 598 }
 599
 600 static struct dvb_demux_feed *dvb_dmx_feed_alloc(struct dvb_demux *demux)
 601 {
 602         int i;
 603
 604         for (i = 0; i < demux->feednum; i++)
 605                 if (demux->feed[i].state == DMX_STATE_FREE)
 606                         break;
 607
 608         if (i == demux->feednum)
 609                 return NULL;
 610
 611         demux->feed[i].state = DMX_STATE_ALLOCATED;
 612
 613         return &demux->feed[i];
 614 }
 615
 616 static int dvb_demux_feed_find(struct dvb_demux_feed *feed)
 617 {
 618         struct dvb_demux_feed *entry;
 619
 620         list_for_each_entry(entry, &feed->demux->feed_list, list_head)
 621                 if (entry == feed)
 622                         return 1;
 623
 624         return 0;
 625 }
 626
 627 static void dvb_demux_feed_add(struct dvb_demux_feed *feed)
 628 {
 629         spin_lock_irq(&feed->demux->lock);
 630         if (dvb_demux_feed_find(feed)) {
 631                 printk(KERN_ERR "%s: feed already in list (type=%x state=%x pid=%x)\n",
 632                        __func__, feed->type, feed->state, feed->pid);
 633                 goto out;
 634         }
 635
 636         list_add(&feed->list_head, &feed->demux->feed_list);
 637 out:
 638         spin_unlock_irq(&feed->demux->lock);
 639 }
 640
 641 static void dvb_demux_feed_del(struct dvb_demux_feed *feed)
 642 {
 643         spin_lock_irq(&feed->demux->lock);
 644         if (!(dvb_demux_feed_find(feed))) {
 645                 printk(KERN_ERR "%s: feed not in list (type=%x state=%x pid=%x)\n",
 646                        __func__, feed->type, feed->state, feed->pid);
 647                 goto out;
 648         }
 649
 650         list_del(&feed->list_head);
 651 out:
 652         spin_unlock_irq(&feed->demux->lock);
 653 }
 654
 655 static int dmx_ts_feed_set(struct dmx_ts_feed *ts_feed, u16 pid, int ts_type,
 656                            enum dmx_ts_pes pes_type,
 657                            size_t circular_buffer_size, struct timespec timeout)
 658 {
 659         struct dvb_demux_feed *feed = (struct dvb_demux_feed *)ts_feed;
 660         struct dvb_demux *demux = feed->demux;
 661
 662         if (pid > DMX_MAX_PID)
 663                 return -EINVAL;
 664
 665         if (mutex_lock_interruptible(&demux->mutex))
 666                 return -ERESTARTSYS;
 667
 668         if (ts_type & TS_DECODER) {
 669                 if (pes_type >= DMX_TS_PES_OTHER) {
 670                         mutex_unlock(&demux->mutex);
 671                         return -EINVAL;
 672                 }
 673
 674                 if (demux->pesfilter[pes_type] &&
 675                     demux->pesfilter[pes_type] != feed) {
 676                         mutex_unlock(&demux->mutex);
 677                         return -EINVAL;
 678                 }
 679
 680                 demux->pesfilter[pes_type] = feed;
 681                 demux->pids[pes_type] = pid;
 682         }
 683
 684         dvb_demux_feed_add(feed);
 685
 686         feed->pid = pid;
 687         feed->buffer_size = circular_buffer_size;
 688         feed->timeout = timeout;
 689         feed->ts_type = ts_type;
 690         feed->pes_type = pes_type;
 691
 692         if (feed->buffer_size) {
 693 #ifdef NOBUFS
 694                 feed->buffer = NULL;
 695 #else
 696                 feed->buffer = vmalloc(feed->buffer_size);
 697                 if (!feed->buffer) {
 698                         mutex_unlock(&demux->mutex);
 699                         return -ENOMEM;
 700                 }
 701 #endif
 702         }
 703
 704         feed->state = DMX_STATE_READY;
 705         mutex_unlock(&demux->mutex);
 706
 707         return 0;
 708 }
 709
 710 static int dmx_ts_feed_start_filtering(struct dmx_ts_feed *ts_feed)
 711 {
 712         struct dvb_demux_feed *feed = (struct dvb_demux_feed *)ts_feed;
 713         struct dvb_demux *demux = feed->demux;
 714         int ret;
 715
 716         if (mutex_lock_interruptible(&demux->mutex))
 717                 return -ERESTARTSYS;
 718
 719         if (feed->state != DMX_STATE_READY || feed->type != DMX_TYPE_TS) {
 720                 mutex_unlock(&demux->mutex);
 721                 return -EINVAL;
 722         }
 723
 724         if (!demux->start_feed) {
 725                 mutex_unlock(&demux->mutex);
 726                 return -ENODEV;
 727         }
 728
 729         if ((ret = demux->start_feed(feed)) < 0) {
 730                 mutex_unlock(&demux->mutex);
 731                 return ret;
 732         }
 733
 734         spin_lock_irq(&demux->lock);
 735         ts_feed->is_filtering = 1;
 736         feed->state = DMX_STATE_GO;
 737         spin_unlock_irq(&demux->lock);
 738         mutex_unlock(&demux->mutex);
 739
 740         return 0;
 741 }
 742
 743 static int dmx_ts_feed_stop_filtering(struct dmx_ts_feed *ts_feed)
 744 {
 745         struct dvb_demux_feed *feed = (struct dvb_demux_feed *)ts_feed;
 746         struct dvb_demux *demux = feed->demux;
 747         int ret;
 748
 749         mutex_lock(&demux->mutex);
 750
 751         if (feed->state < DMX_STATE_GO) {
 752                 mutex_unlock(&demux->mutex);
 753                 return -EINVAL;
 754         }
 755
 756         if (!demux->stop_feed) {
 757                 mutex_unlock(&demux->mutex);
 758                 return -ENODEV;
 759         }
 760
 761         ret = demux->stop_feed(feed);
 762
 763         spin_lock_irq(&demux->lock);
 764         ts_feed->is_filtering = 0;
 765         feed->state = DMX_STATE_ALLOCATED;
 766         spin_unlock_irq(&demux->lock);
 767         mutex_unlock(&demux->mutex);
 768
 769         return ret;
 770 }
 771
 772 static int dvbdmx_allocate_ts_feed(struct dmx_demux *dmx,
 773                                    struct dmx_ts_feed **ts_feed,
 774                                    dmx_ts_cb callback)
 775 {
 776         struct dvb_demux *demux = (struct dvb_demux *)dmx;
 777         struct dvb_demux_feed *feed;
 778
 779         if (mutex_lock_interruptible(&demux->mutex))
 780                 return -ERESTARTSYS;
 781
 782         if (!(feed = dvb_dmx_feed_alloc(demux))) {
 783                 mutex_unlock(&demux->mutex);
 784                 return -EBUSY;
 785         }
 786
 787         feed->type = DMX_TYPE_TS;
 788         feed->cb.ts = callback;
 789         feed->demux = demux;
 790         feed->pid = 0xffff;
 791         feed->peslen = 0xfffa;
 792         feed->buffer = NULL;
 793
 794         (*ts_feed) = &feed->feed.ts;
 795         (*ts_feed)->parent = dmx;
 796         (*ts_feed)->priv = NULL;
 797         (*ts_feed)->is_filtering = 0;
 798         (*ts_feed)->start_filtering = dmx_ts_feed_start_filtering;
 799         (*ts_feed)->stop_filtering = dmx_ts_feed_stop_filtering;
 800         (*ts_feed)->set = dmx_ts_feed_set;
 801
 802         if (!(feed->filter = dvb_dmx_filter_alloc(demux))) {
 803                 feed->state = DMX_STATE_FREE;
 804                 mutex_unlock(&demux->mutex);
 805                 return -EBUSY;
 806         }
 807
 808         feed->filter->type = DMX_TYPE_TS;
 809         feed->filter->feed = feed;
 810         feed->filter->state = DMX_STATE_READY;
 811
 812         mutex_unlock(&demux->mutex);
 813
 814         return 0;
 815 }
 816
 817 static int dvbdmx_release_ts_feed(struct dmx_demux *dmx,
 818                                   struct dmx_ts_feed *ts_feed)
 819 {
 820         struct dvb_demux *demux = (struct dvb_demux *)dmx;
 821         struct dvb_demux_feed *feed = (struct dvb_demux_feed *)ts_feed;
 822
 823         mutex_lock(&demux->mutex);
 824
 825         if (feed->state == DMX_STATE_FREE) {
 826                 mutex_unlock(&demux->mutex);
 827                 return -EINVAL;
 828         }
 829 #ifndef NOBUFS
 830         vfree(feed->buffer);
 831         feed->buffer = NULL;
 832 #endif
 833
 834         feed->state = DMX_STATE_FREE;
 835         feed->filter->state = DMX_STATE_FREE;
 836
 837         dvb_demux_feed_del(feed);
 838
 839         feed->pid = 0xffff;
 840
 841         if (feed->ts_type & TS_DECODER && feed->pes_type < DMX_TS_PES_OTHER)
 842                 demux->pesfilter[feed->pes_type] = NULL;
 843
 844         mutex_unlock(&demux->mutex);
 845         return 0;
 846 }
 847
 848 /******************************************************************************
 849  * dmx_section_feed API calls
 850  ******************************************************************************/
 851
 852 static int dmx_section_feed_allocate_filter(struct dmx_section_feed *feed,
 853                                             struct dmx_section_filter **filter)
 854 {
 855         struct dvb_demux_feed *dvbdmxfeed = (struct dvb_demux_feed *)feed;
 856         struct dvb_demux *dvbdemux = dvbdmxfeed->demux;
 857         struct dvb_demux_filter *dvbdmxfilter;
 858
 859         if (mutex_lock_interruptible(&dvbdemux->mutex))
 860                 return -ERESTARTSYS;
 861
 862         dvbdmxfilter = dvb_dmx_filter_alloc(dvbdemux);
 863         if (!dvbdmxfilter) {
 864                 mutex_unlock(&dvbdemux->mutex);
 865                 return -EBUSY;
 866         }
 867
 868         spin_lock_irq(&dvbdemux->lock);
 869         *filter = &dvbdmxfilter->filter;
 870         (*filter)->parent = feed;
 871         (*filter)->priv = NULL;
 872         dvbdmxfilter->feed = dvbdmxfeed;
 873         dvbdmxfilter->type = DMX_TYPE_SEC;
 874         dvbdmxfilter->state = DMX_STATE_READY;
 875         dvbdmxfilter->next = dvbdmxfeed->filter;
 876         dvbdmxfeed->filter = dvbdmxfilter;
 877         spin_unlock_irq(&dvbdemux->lock);
 878
 879         mutex_unlock(&dvbdemux->mutex);
 880         return 0;
 881 }
 882
 883 static int dmx_section_feed_set(struct dmx_section_feed *feed,
 884                                 u16 pid, size_t circular_buffer_size,
 885                                 int check_crc)
 886 {
 887         struct dvb_demux_feed *dvbdmxfeed = (struct dvb_demux_feed *)feed;
 888         struct dvb_demux *dvbdmx = dvbdmxfeed->demux;
 889
 890         if (pid > 0x1fff)
 891                 return -EINVAL;
 892
 893         if (mutex_lock_interruptible(&dvbdmx->mutex))
 894                 return -ERESTARTSYS;
 895
 896         dvb_demux_feed_add(dvbdmxfeed);
 897
 898         dvbdmxfeed->pid = pid;
 899         dvbdmxfeed->buffer_size = circular_buffer_size;
 900         dvbdmxfeed->feed.sec.check_crc = check_crc;
 901
 902 #ifdef NOBUFS
 903         dvbdmxfeed->buffer = NULL;
 904 #else
 905         dvbdmxfeed->buffer = vmalloc(dvbdmxfeed->buffer_size);
 906         if (!dvbdmxfeed->buffer) {
 907                 mutex_unlock(&dvbdmx->mutex);
 908                 return -ENOMEM;
 909         }
 910 #endif
 911
 912         dvbdmxfeed->state = DMX_STATE_READY;
 913         mutex_unlock(&dvbdmx->mutex);
 914         return 0;
 915 }
 916
 917 static void prepare_secfilters(struct dvb_demux_feed *dvbdmxfeed)
 918 {
 919         int i;
 920         struct dvb_demux_filter *f;
 921         struct dmx_section_filter *sf;
 922         u8 mask, mode, doneq;
 923
 924         if (!(f = dvbdmxfeed->filter))
 925                 return;
 926         do {
 927                 sf = &f->filter;
 928                 doneq = 0;
 929                 for (i = 0; i < DVB_DEMUX_MASK_MAX; i++) {
 930                         mode = sf->filter_mode[i];
 931                         mask = sf->filter_mask[i];
 932                         f->maskandmode[i] = mask & mode;
 933                         doneq |= f->maskandnotmode[i] = mask & ~mode;
 934                 }
 935                 f->doneq = doneq ? 1 : 0;
 936         } while ((f = f->next));
 937 }
 938
 939 static int dmx_section_feed_start_filtering(struct dmx_section_feed *feed)
 940 {
 941         struct dvb_demux_feed *dvbdmxfeed = (struct dvb_demux_feed *)feed;
 942         struct dvb_demux *dvbdmx = dvbdmxfeed->demux;
 943         int ret;
 944
 945         if (mutex_lock_interruptible(&dvbdmx->mutex))
 946                 return -ERESTARTSYS;
 947
 948         if (feed->is_filtering) {
 949                 mutex_unlock(&dvbdmx->mutex);
 950                 return -EBUSY;
 951         }
 952
 953         if (!dvbdmxfeed->filter) {
 954                 mutex_unlock(&dvbdmx->mutex);
 955                 return -EINVAL;
 956         }
 957
 958         dvbdmxfeed->feed.sec.tsfeedp = 0;
 959         dvbdmxfeed->feed.sec.secbuf = dvbdmxfeed->feed.sec.secbuf_base;
 960         dvbdmxfeed->feed.sec.secbufp = 0;
 961         dvbdmxfeed->feed.sec.seclen = 0;
 962
 963         if (!dvbdmx->start_feed) {
 964                 mutex_unlock(&dvbdmx->mutex);
 965                 return -ENODEV;
 966         }
 967
 968         prepare_secfilters(dvbdmxfeed);
 969
 970         if ((ret = dvbdmx->start_feed(dvbdmxfeed)) < 0) {
 971                 mutex_unlock(&dvbdmx->mutex);
 972                 return ret;
 973         }
 974
 975         spin_lock_irq(&dvbdmx->lock);
 976         feed->is_filtering = 1;
 977         dvbdmxfeed->state = DMX_STATE_GO;
 978         spin_unlock_irq(&dvbdmx->lock);
 979
 980         mutex_unlock(&dvbdmx->mutex);
 981         return 0;
 982 }
 983
 984 static int dmx_section_feed_stop_filtering(struct dmx_section_feed *feed)
 985 {
 986         struct dvb_demux_feed *dvbdmxfeed = (struct dvb_demux_feed *)feed;
 987         struct dvb_demux *dvbdmx = dvbdmxfeed->demux;
 988         int ret;
 989
 990         mutex_lock(&dvbdmx->mutex);
 991
 992         if (!dvbdmx->stop_feed) {
 993                 mutex_unlock(&dvbdmx->mutex);
 994                 return -ENODEV;
 995         }
 996
 997         ret = dvbdmx->stop_feed(dvbdmxfeed);
 998
 999         spin_lock_irq(&dvbdmx->lock);
1000         dvbdmxfeed->state = DMX_STATE_READY;
1001         feed->is_filtering = 0;
1002         spin_unlock_irq(&dvbdmx->lock);
1003
1004         mutex_unlock(&dvbdmx->mutex);
1005         return ret;
1006 }
1007
1008 static int dmx_section_feed_release_filter(struct dmx_section_feed *feed,
1009                                            struct dmx_section_filter *filter)
1010 {
1011         struct dvb_demux_filter *dvbdmxfilter = (struct dvb_demux_filter *)filter, *f;
1012         struct dvb_demux_feed *dvbdmxfeed = (struct dvb_demux_feed *)feed;
1013         struct dvb_demux *dvbdmx = dvbdmxfeed->demux;
1014
1015         mutex_lock(&dvbdmx->mutex);
1016
1017         if (dvbdmxfilter->feed != dvbdmxfeed) {
1018                 mutex_unlock(&dvbdmx->mutex);
1019                 return -EINVAL;
1020         }
1021
1022         if (feed->is_filtering)
1023                 feed->stop_filtering(feed);
1024
1025         spin_lock_irq(&dvbdmx->lock);
1026         f = dvbdmxfeed->filter;
1027
1028         if (f == dvbdmxfilter) {
1029                 dvbdmxfeed->filter = dvbdmxfilter->next;
1030         } else {
1031                 while (f->next != dvbdmxfilter)
1032                         f = f->next;
1033                 f->next = f->next->next;
1034         }
1035
1036         dvbdmxfilter->state = DMX_STATE_FREE;
1037         spin_unlock_irq(&dvbdmx->lock);
1038         mutex_unlock(&dvbdmx->mutex);
1039         return 0;
1040 }
1041
1042 static int dvbdmx_allocate_section_feed(struct dmx_demux *demux,
1043                                         struct dmx_section_feed **feed,
1044                                         dmx_section_cb callback)
1045 {
1046         struct dvb_demux *dvbdmx = (struct dvb_demux *)demux;
1047         struct dvb_demux_feed *dvbdmxfeed;
1048
1049         if (mutex_lock_interruptible(&dvbdmx->mutex))
1050                 return -ERESTARTSYS;
1051
1052         if (!(dvbdmxfeed = dvb_dmx_feed_alloc(dvbdmx))) {
1053                 mutex_unlock(&dvbdmx->mutex);
1054                 return -EBUSY;
1055         }
1056
1057         dvbdmxfeed->type = DMX_TYPE_SEC;
1058         dvbdmxfeed->cb.sec = callback;
1059         dvbdmxfeed->demux = dvbdmx;
1060         dvbdmxfeed->pid = 0xffff;
1061         dvbdmxfeed->feed.sec.secbuf = dvbdmxfeed->feed.sec.secbuf_base;
1062         dvbdmxfeed->feed.sec.secbufp = dvbdmxfeed->feed.sec.seclen = 0;
1063         dvbdmxfeed->feed.sec.tsfeedp = 0;
1064         dvbdmxfeed->filter = NULL;
1065         dvbdmxfeed->buffer = NULL;
1066
1067         (*feed) = &dvbdmxfeed->feed.sec;
1068         (*feed)->is_filtering = 0;
1069         (*feed)->parent = demux;
1070         (*feed)->priv = NULL;
1071
1072         (*feed)->set = dmx_section_feed_set;
1073         (*feed)->allocate_filter = dmx_section_feed_allocate_filter;
1074         (*feed)->start_filtering = dmx_section_feed_start_filtering;
1075         (*feed)->stop_filtering = dmx_section_feed_stop_filtering;
1076         (*feed)->release_filter = dmx_section_feed_release_filter;
1077
1078         mutex_unlock(&dvbdmx->mutex);
1079         return 0;
1080 }
1081
1082 static int dvbdmx_release_section_feed(struct dmx_demux *demux,
1083                                        struct dmx_section_feed *feed)
1084 {
1085         struct dvb_demux_feed *dvbdmxfeed = (struct dvb_demux_feed *)feed;
1086         struct dvb_demux *dvbdmx = (struct dvb_demux *)demux;
1087
1088         mutex_lock(&dvbdmx->mutex);
1089
1090         if (dvbdmxfeed->state == DMX_STATE_FREE) {
1091                 mutex_unlock(&dvbdmx->mutex);
1092                 return -EINVAL;
1093         }
1094 #ifndef NOBUFS
1095         vfree(dvbdmxfeed->buffer);
1096         dvbdmxfeed->buffer = NULL;
1097 #endif
1098         dvbdmxfeed->state = DMX_STATE_FREE;
1099
1100         dvb_demux_feed_del(dvbdmxfeed);
1101
1102         dvbdmxfeed->pid = 0xffff;
1103
1104         mutex_unlock(&dvbdmx->mutex);
1105         return 0;
1106 }
1107
1108 /******************************************************************************
1109  * dvb_demux kernel data API calls
1110  ******************************************************************************/
1111
1112 static int dvbdmx_open(struct dmx_demux *demux)
1113 {
1114         struct dvb_demux *dvbdemux = (struct dvb_demux *)demux;
1115
1116         if (dvbdemux->users >= MAX_DVB_DEMUX_USERS)
1117                 return -EUSERS;
1118
1119         dvbdemux->users++;
1120         return 0;
1121 }
1122
1123 static int dvbdmx_close(struct dmx_demux *demux)
1124 {
1125         struct dvb_demux *dvbdemux = (struct dvb_demux *)demux;
1126
1127         if (dvbdemux->users == 0)
1128                 return -ENODEV;
1129
1130         dvbdemux->users--;
1131         //FIXME: release any unneeded resources if users==0
1132         return 0;
1133 }
1134
1135 static int dvbdmx_write(struct dmx_demux *demux, const char __user *buf, size_t count)
1136 {
1137         struct dvb_demux *dvbdemux = (struct dvb_demux *)demux;
1138         void *p;
1139
1140         if ((!demux->frontend) || (demux->frontend->source != DMX_MEMORY_FE))
1141                 return -EINVAL;
1142
1143         p = kmalloc(count, GFP_USER);
1144         if (!p)
1145                 return -ENOMEM;
1146         if (copy_from_user(p, buf, count)) {
1147                 kfree(p);
1148                 return -EFAULT;
1149         }
1150         if (mutex_lock_interruptible(&dvbdemux->mutex)) {
1151                 kfree(p);
1152                 return -ERESTARTSYS;
1153         }
1154         dvb_dmx_swfilter(dvbdemux, p, count);
1155         kfree(p);
1156         mutex_unlock(&dvbdemux->mutex);
1157
1158         if (signal_pending(current))
1159                 return -EINTR;
1160         return count;
1161 }
1162
1163 static int dvbdmx_add_frontend(struct dmx_demux *demux,
1164                                struct dmx_frontend *frontend)
1165 {
1166         struct dvb_demux *dvbdemux = (struct dvb_demux *)demux;
1167         struct list_head *head = &dvbdemux->frontend_list;
1168
1169         list_add(&(frontend->connectivity_list), head);
1170
1171         return 0;
1172 }
1173
1174 static int dvbdmx_remove_frontend(struct dmx_demux *demux,
1175                                   struct dmx_frontend *frontend)
1176 {
1177         struct dvb_demux *dvbdemux = (struct dvb_demux *)demux;
1178         struct list_head *pos, *n, *head = &dvbdemux->frontend_list;
1179
1180         list_for_each_safe(pos, n, head) {
1181                 if (DMX_FE_ENTRY(pos) == frontend) {
1182                         list_del(pos);
1183                         return 0;
1184                 }
1185         }
1186
1187         return -ENODEV;
1188 }
1189
1190 static struct list_head *dvbdmx_get_frontends(struct dmx_demux *demux)
1191 {
1192         struct dvb_demux *dvbdemux = (struct dvb_demux *)demux;
1193
1194         if (list_empty(&dvbdemux->frontend_list))
1195                 return NULL;
1196
1197         return &dvbdemux->frontend_list;
1198 }
1199
1200 static int dvbdmx_connect_frontend(struct dmx_demux *demux,
1201                                    struct dmx_frontend *frontend)
1202 {
1203         struct dvb_demux *dvbdemux = (struct dvb_demux *)demux;
1204
1205         if (demux->frontend)
1206                 return -EINVAL;
1207
1208         mutex_lock(&dvbdemux->mutex);
1209
1210         demux->frontend = frontend;
1211         mutex_unlock(&dvbdemux->mutex);
1212         return 0;
1213 }
1214
1215 static int dvbdmx_disconnect_frontend(struct dmx_demux *demux)
1216 {
1217         struct dvb_demux *dvbdemux = (struct dvb_demux *)demux;
1218
1219         mutex_lock(&dvbdemux->mutex);
1220
1221         demux->frontend = NULL;
1222         mutex_unlock(&dvbdemux->mutex);
1223         return 0;
1224 }
1225
1226 static int dvbdmx_get_pes_pids(struct dmx_demux *demux, u16 * pids)
1227 {
1228         struct dvb_demux *dvbdemux = (struct dvb_demux *)demux;
1229
1230         memcpy(pids, dvbdemux->pids, 5 * sizeof(u16));
1231         return 0;
1232 }
1233
1234 int dvb_dmx_init(struct dvb_demux *dvbdemux)
1235 {
1236         int i;
1237         struct dmx_demux *dmx = &dvbdemux->dmx;
1238
1239         dvbdemux->cnt_storage = NULL;
1240         dvbdemux->users = 0;
1241         dvbdemux->filter = vmalloc(dvbdemux->filternum * sizeof(struct dvb_demux_filter));
1242
1243         if (!dvbdemux->filter)
1244                 return -ENOMEM;
1245
1246         dvbdemux->feed = vmalloc(dvbdemux->feednum * sizeof(struct dvb_demux_feed));
1247         if (!dvbdemux->feed) {
1248                 vfree(dvbdemux->filter);
1249                 return -ENOMEM;
1250         }
1251         for (i = 0; i < dvbdemux->filternum; i++) {
1252                 dvbdemux->filter[i].state = DMX_STATE_FREE;
1253                 dvbdemux->filter[i].index = i;
1254         }
1255         for (i = 0; i < dvbdemux->feednum; i++) {
1256                 dvbdemux->feed[i].state = DMX_STATE_FREE;
1257                 dvbdemux->feed[i].index = i;
1258         }
1259
1260         INIT_LIST_HEAD(&dvbdemux->frontend_list);
1261
1262         for (i = 0; i < DMX_TS_PES_OTHER; i++) {
1263                 dvbdemux->pesfilter[i] = NULL;
1264                 dvbdemux->pids[i] = 0xffff;
1265         }
1266
1267         INIT_LIST_HEAD(&dvbdemux->feed_list);
1268
1269         dvbdemux->playing = 0;
1270         dvbdemux->recording = 0;
1271         dvbdemux->tsbufp = 0;
1272
1273         if (!dvbdemux->check_crc32)
1274                 dvbdemux->check_crc32 = dvb_dmx_crc32;
1275
1276         if (!dvbdemux->memcopy)
1277                 dvbdemux->memcopy = dvb_dmx_memcopy;
1278
1279         dmx->frontend = NULL;
1280         dmx->priv = dvbdemux;
1281         dmx->open = dvbdmx_open;
1282         dmx->close = dvbdmx_close;
1283         dmx->write = dvbdmx_write;
1284         dmx->allocate_ts_feed = dvbdmx_allocate_ts_feed;
1285         dmx->release_ts_feed = dvbdmx_release_ts_feed;
1286         dmx->allocate_section_feed = dvbdmx_allocate_section_feed;
1287         dmx->release_section_feed = dvbdmx_release_section_feed;
1288
1289         dmx->add_frontend = dvbdmx_add_frontend;
1290         dmx->remove_frontend = dvbdmx_remove_frontend;
1291         dmx->get_frontends = dvbdmx_get_frontends;
1292         dmx->connect_frontend = dvbdmx_connect_frontend;
1293         dmx->disconnect_frontend = dvbdmx_disconnect_frontend;
1294         dmx->get_pes_pids = dvbdmx_get_pes_pids;
1295
1296         mutex_init(&dvbdemux->mutex);
1297         spin_lock_init(&dvbdemux->lock);
1298
1299         return 0;
1300 }
1301
1302 EXPORT_SYMBOL(dvb_dmx_init);
1303
1304 void dvb_dmx_release(struct dvb_demux *dvbdemux)
1305 {
1306         vfree(dvbdemux->cnt_storage);
1307         vfree(dvbdemux->filter);
1308         vfree(dvbdemux->feed);
1309 }
1310
1311 EXPORT_SYMBOL(dvb_dmx_release);