diff options
| author | Andreas Oberritter | 2005-09-09 22:02:24 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-09-09 22:57:37 +0200 |
| commit | 5d2cd1631e97f5eb9c8666ff9cd8011cd5c12e7d (patch) | |
| tree | 7eabb376cdeb510392e8b699ec212a74e45b6f60 /drivers/media/dvb/dvb-core/demux.h | |
| parent | [PATCH] dvb: core: dvb_demux: remove unsused descramble callbacks (diff) | |
| download | kernel-qcow2-linux-5d2cd1631e97f5eb9c8666ff9cd8011cd5c12e7d.tar.gz kernel-qcow2-linux-5d2cd1631e97f5eb9c8666ff9cd8011cd5c12e7d.tar.xz kernel-qcow2-linux-5d2cd1631e97f5eb9c8666ff9cd8011cd5c12e7d.zip | |
[PATCH] dvb: core: dvb_demux: remove more unused cruft
Removed more unused variables and constants.
Signed-off-by: Andreas Oberritter <obi@linuxtv.org>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/dvb/dvb-core/demux.h')
| -rw-r--r-- | drivers/media/dvb/dvb-core/demux.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/media/dvb/dvb-core/demux.h b/drivers/media/dvb/dvb-core/demux.h index ee5be59759ee..9719a3b30f78 100644 --- a/drivers/media/dvb/dvb-core/demux.h +++ b/drivers/media/dvb/dvb-core/demux.h @@ -125,9 +125,7 @@ struct dmx_ts_feed { u16 pid, int type, enum dmx_ts_pes pes_type, - size_t callback_length, size_t circular_buffer_size, - int descramble, struct timespec timeout); int (*start_filtering) (struct dmx_ts_feed* feed); int (*stop_filtering) (struct dmx_ts_feed* feed); @@ -160,7 +158,6 @@ struct dmx_section_feed { int (*set) (struct dmx_section_feed* feed, u16 pid, size_t circular_buffer_size, - int descramble, int check_crc); int (*allocate_filter) (struct dmx_section_feed* feed, struct dmx_section_filter** filter); @@ -208,7 +205,6 @@ struct dmx_frontend { struct list_head connectivity_list; /* List of front-ends that can be connected to a particular demux */ - void* priv; /* Pointer to private data of the API client */ enum dmx_frontend_source source; }; @@ -226,8 +222,6 @@ struct dmx_frontend { #define DMX_MEMORY_BASED_FILTERING 8 /* write() available */ #define DMX_CRC_CHECKING 16 #define DMX_TS_DESCRAMBLING 32 -#define DMX_SECTION_PAYLOAD_DESCRAMBLING 64 -#define DMX_MAC_ADDRESS_DESCRAMBLING 128 /* * Demux resource type identifier. @@ -246,7 +240,6 @@ struct dmx_demux { u32 capabilities; /* Bitfield of capability flags */ struct dmx_frontend* frontend; /* Front-end connected to the demux */ void* priv; /* Pointer to private data of the API client */ - int users; /* Number of users */ int (*open) (struct dmx_demux* demux); int (*close) (struct dmx_demux* demux); int (*write) (struct dmx_demux* demux, const char* buf, size_t count); |