summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/b2c2/skystar2.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/dvb/b2c2/skystar2.c')
-rw-r--r--linux/drivers/media/dvb/b2c2/skystar2.c35
1 files changed, 2 insertions, 33 deletions
diff --git a/linux/drivers/media/dvb/b2c2/skystar2.c b/linux/drivers/media/dvb/b2c2/skystar2.c
index e7635e502..1bfff5a43 100644
--- a/linux/drivers/media/dvb/b2c2/skystar2.c
+++ b/linux/drivers/media/dvb/b2c2/skystar2.c
@@ -60,17 +60,6 @@ struct dmaq {
u8 *buffer;
};
-struct packet_header {
-
- u32 sync_byte;
- u32 transport_error_indicator;
- u32 payload_unit_start_indicator;
- u32 transport_priority;
- u32 pid;
- u32 transport_scrambling_control;
- u32 adaptation_field_control;
- u32 continuity_counter;
-};
struct adapter {
@@ -1809,7 +1798,6 @@ static void close_stream(struct adapter *adapter, u32 pid)
static void interrupt_service_dma1(struct adapter *adapter)
{
struct dvb_demux *dvbdmx = &adapter->demux;
- struct packet_header packet_header;
int n_cur_dma_counter;
u32 n_num_bytes_parsed;
@@ -1856,27 +1844,8 @@ static void interrupt_service_dma1(struct adapter *adapter)
}
if (adapter->capturing != 0) {
- u32 *dq = (u32 *) pb_dma_buf_cur_pos;
-
- packet_header.sync_byte = *dq & 0x000000FF;
- packet_header.transport_error_indicator = *dq & 0x00008000;
- packet_header.payload_unit_start_indicator = *dq & 0x00004000;
- packet_header.transport_priority = *dq & 0x00002000;
- packet_header.pid = ((*dq & 0x00FF0000) >> 0x10) | (*dq & 0x00001F00);
- packet_header.transport_scrambling_control = *dq >> 0x1E;
- packet_header.adaptation_field_control = (*dq & 0x30000000) >> 0x1C;
- packet_header.continuity_counter = (*dq & 0x0F000000) >> 0x18;
-
- if ((packet_header.sync_byte == 0x47) && (packet_header.transport_error_indicator == 0) && (packet_header.pid != 0x1FFF)) {
- if (check_pid(adapter, packet_header.pid & 0x0000FFFF) != 0)
- {
- dvb_dmx_swfilter_packets(dvbdmx, pb_dma_buf_cur_pos, dw_default_packet_size / 188);
-
- } else {
-
- dprintk("%s: pid=%x\n", __FUNCTION__, packet_header.pid);
- }
- }
+ dvb_dmx_swfilter_packets(dvbdmx, pb_dma_buf_cur_pos,
+ dw_default_packet_size / 188);
}
n_num_bytes_parsed = n_num_bytes_parsed + dw_default_packet_size;