#Applies against: 2.6.17
#Signed-off-by: Uwe Bugla <uwe.bugla@xxxxxx>
#Changes: fix type and / or tab errors, wipes out uncommented material
--- a/drivers/media/dvb/dvb-core/dvb_demux.c 2006-05-27 14:03:00
+++ b/drivers/media/dvb/dvb-core/dvb_demux.c 2006-05-28 15:08:00
@@ -18,29 +18,21 @@
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
*/
-
#include <linux/spinlock.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/module.h>
#include <linux/poll.h>
#include <linux/string.h>
#include <linux/crc32.h>
#include <asm/uaccess.h>
-
#include "dvb_demux.h"
-
#define NOBUFS
-/*
-** #define DVB_DEMUX_SECTION_LOSS_LOG to monitor payload loss in the syslog
-*/
-// #define DVB_DEMUX_SECTION_LOSS_LOG
-/******************************************************************************
+/*********************************
* static inlined helper functions
- ******************************************************************************/
+ ********************************/
static inline u16 section_length(const u8 *buf)
{
@@ -78,36 +70,21 @@
memcpy(d, s, len);
}
-/******************************************************************************
+/***************************
* Software filter functions
- ******************************************************************************/
+ **************************/
static inline int dvb_dmx_swfilter_payload(struct dvb_demux_feed *feed,
const u8 *buf)
{
int count = payload(buf);
int p;
- //int ccok;
- //u8 cc;
-
if (count == 0)
return -1;
-
p = 188 - count;
-
- /*
- cc = buf[3] & 0x0f;
- ccok = ((feed->cc + 1) & 0x0f) == cc;
- feed->cc = cc;
- if (!ccok)
- printk("missed packet!\n");
- */
-
if (buf[1] & 0x40) // PUSI ?
feed->peslen = 0xfffa;
-
feed->peslen += count;
-
return feed->cb.ts(&buf[p], count, NULL, 0, &feed->feed.ts, DMX_OK);
}
@@ -450,20 +427,15 @@
} else
p++;
}
-
-bailout:
+ bailout:
spin_unlock(&demux->lock);
}
-
EXPORT_SYMBOL(dvb_dmx_swfilter);
-
void dvb_dmx_swfilter_204(struct dvb_demux *demux, const u8 *buf, size_t count)
{
int p = 0, i, j;
u8 tmppack[188];
-
spin_lock(&demux->lock);
-
if (demux->tsbufp) {
i = demux->tsbufp;
j = 204 - i;
@@ -501,13 +473,10 @@
p++;
}
}
-
-bailout:
+ bailout:
spin_unlock(&demux->lock);
}
-
EXPORT_SYMBOL(dvb_dmx_swfilter_204);
-
static struct dvb_demux_filter *dvb_dmx_filter_alloc(struct dvb_demux *demux)
{
int i;
@@ -774,9 +743,9 @@
return 0;
}
-/******************************************************************************
+/****************************
* dmx_section_feed API calls
- ******************************************************************************/
+ ***************************/
static int dmx_section_feed_allocate_filter(struct dmx_section_feed *feed,
struct dmx_section_filter **filter)
@@ -1037,9 +1006,9 @@
return 0;
}
-/******************************************************************************
+/*********************************
* dvb_demux kernel data API calls
- ******************************************************************************/
+ ********************************/
static int dvbdmx_open(struct dmx_demux *demux)
{
--
Echte DSL-Flatrate dauerhaft für 0,- Euro*!
"Feel free" mit GMX DSL! http://www.gmx.net/de/go/dsl
_______________________________________________
linux-dvb@xxxxxxxxxxx
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linux-dvb
