Commit dad4a730 authored by Andreas Oberritter's avatar Andreas Oberritter Committed by Linus Torvalds

[PATCH] dvb: core: dvb_demux formatting fixes

Formatting fixes (Lindent + some handwork).
Signed-off-by: default avatarAndreas Oberritter <obi@linuxtv.org>
Signed-off-by: default avatarJohannes Stezenbach <js@linuxtv.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent db574d7d
This diff is collapsed.
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
* *
*/ */
#ifndef _DVB_DEMUX_H_ #ifndef _DVB_DEMUX_H_
#define _DVB_DEMUX_H_ #define _DVB_DEMUX_H_
...@@ -44,98 +43,98 @@ ...@@ -44,98 +43,98 @@
#define DVB_DEMUX_MASK_MAX 18 #define DVB_DEMUX_MASK_MAX 18
struct dvb_demux_filter { struct dvb_demux_filter {
struct dmx_section_filter filter; struct dmx_section_filter filter;
u8 maskandmode [DMX_MAX_FILTER_SIZE]; u8 maskandmode[DMX_MAX_FILTER_SIZE];
u8 maskandnotmode [DMX_MAX_FILTER_SIZE]; u8 maskandnotmode[DMX_MAX_FILTER_SIZE];
int doneq; int doneq;
struct dvb_demux_filter *next; struct dvb_demux_filter *next;
struct dvb_demux_feed *feed; struct dvb_demux_feed *feed;
int index; int index;
int state; int state;
int type; int type;
u16 hw_handle; u16 hw_handle;
struct timer_list timer; struct timer_list timer;
}; };
#define DMX_FEED_ENTRY(pos) list_entry(pos, struct dvb_demux_feed, list_head) #define DMX_FEED_ENTRY(pos) list_entry(pos, struct dvb_demux_feed, list_head)
struct dvb_demux_feed { struct dvb_demux_feed {
union { union {
struct dmx_ts_feed ts; struct dmx_ts_feed ts;
struct dmx_section_feed sec; struct dmx_section_feed sec;
} feed; } feed;
union { union {
dmx_ts_cb ts; dmx_ts_cb ts;
dmx_section_cb sec; dmx_section_cb sec;
} cb; } cb;
struct dvb_demux *demux; struct dvb_demux *demux;
void *priv; void *priv;
int type; int type;
int state; int state;
u16 pid; u16 pid;
u8 *buffer; u8 *buffer;
int buffer_size; int buffer_size;
struct timespec timeout; struct timespec timeout;
struct dvb_demux_filter *filter; struct dvb_demux_filter *filter;
int ts_type; int ts_type;
enum dmx_ts_pes pes_type; enum dmx_ts_pes pes_type;
int cc; int cc;
int pusi_seen; /* prevents feeding of garbage from previous section */ int pusi_seen; /* prevents feeding of garbage from previous section */
u16 peslen; u16 peslen;
struct list_head list_head; struct list_head list_head;
unsigned int index; /* a unique index for each feed (can be used as hardware pid filter index) */ unsigned int index; /* a unique index for each feed (can be used as hardware pid filter index) */
}; };
struct dvb_demux { struct dvb_demux {
struct dmx_demux dmx; struct dmx_demux dmx;
void *priv; void *priv;
int filternum; int filternum;
int feednum; int feednum;
int (*start_feed) (struct dvb_demux_feed *feed); int (*start_feed)(struct dvb_demux_feed *feed);
int (*stop_feed) (struct dvb_demux_feed *feed); int (*stop_feed)(struct dvb_demux_feed *feed);
int (*write_to_decoder) (struct dvb_demux_feed *feed, int (*write_to_decoder)(struct dvb_demux_feed *feed,
const u8 *buf, size_t len); const u8 *buf, size_t len);
u32 (*check_crc32) (struct dvb_demux_feed *feed, u32 (*check_crc32)(struct dvb_demux_feed *feed,
const u8 *buf, size_t len); const u8 *buf, size_t len);
void (*memcopy) (struct dvb_demux_feed *feed, u8 *dst, void (*memcopy)(struct dvb_demux_feed *feed, u8 *dst,
const u8 *src, size_t len); const u8 *src, size_t len);
int users; int users;
#define MAX_DVB_DEMUX_USERS 10 #define MAX_DVB_DEMUX_USERS 10
struct dvb_demux_filter *filter; struct dvb_demux_filter *filter;
struct dvb_demux_feed *feed; struct dvb_demux_feed *feed;
struct list_head frontend_list; struct list_head frontend_list;
struct dvb_demux_feed *pesfilter[DMX_TS_PES_OTHER]; struct dvb_demux_feed *pesfilter[DMX_TS_PES_OTHER];
u16 pids[DMX_TS_PES_OTHER]; u16 pids[DMX_TS_PES_OTHER];
int playing; int playing;
int recording; int recording;
#define DMX_MAX_PID 0x2000 #define DMX_MAX_PID 0x2000
struct list_head feed_list; struct list_head feed_list;
u8 tsbuf[204]; u8 tsbuf[204];
int tsbufp; int tsbufp;
struct semaphore mutex; struct semaphore mutex;
spinlock_t lock; spinlock_t lock;
}; };
int dvb_dmx_init(struct dvb_demux *dvbdemux); int dvb_dmx_init(struct dvb_demux *dvbdemux);
void dvb_dmx_release(struct dvb_demux *dvbdemux); void dvb_dmx_release(struct dvb_demux *dvbdemux);
void dvb_dmx_swfilter_packets(struct dvb_demux *dvbdmx, const u8 *buf, size_t count); void dvb_dmx_swfilter_packets(struct dvb_demux *dvbdmx, const u8 *buf,
size_t count);
void dvb_dmx_swfilter(struct dvb_demux *demux, const u8 *buf, size_t count); void dvb_dmx_swfilter(struct dvb_demux *demux, const u8 *buf, size_t count);
void dvb_dmx_swfilter_204(struct dvb_demux *demux, const u8 *buf, size_t count); void dvb_dmx_swfilter_204(struct dvb_demux *demux, const u8 *buf,
size_t count);
#endif /* _DVB_DEMUX_H_ */ #endif /* _DVB_DEMUX_H_ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment