Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
34861cdd
Commit
34861cdd
authored
21 years ago
by
Michael Hunold
Committed by
Linus Torvalds
21 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] TTUSB-DEC driver update
[DVB] - Hand off all processing of urb data to a tasklet
parent
beabad15
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
85 additions
and
25 deletions
+85
-25
drivers/media/dvb/ttusb-dec/ttusb_dec.c
drivers/media/dvb/ttusb-dec/ttusb_dec.c
+71
-23
drivers/media/dvb/ttusb-dec/ttusb_dec.h
drivers/media/dvb/ttusb-dec/ttusb_dec.h
+14
-2
No files found.
drivers/media/dvb/ttusb-dec/ttusb_dec.c
View file @
34861cdd
...
@@ -124,14 +124,10 @@ static void ttusb_dec_set_pids(struct ttusb_dec *dec)
...
@@ -124,14 +124,10 @@ static void ttusb_dec_set_pids(struct ttusb_dec *dec)
ttusb_dec_send_command
(
dec
,
0x50
,
sizeof
(
b
),
b
,
NULL
,
NULL
);
ttusb_dec_send_command
(
dec
,
0x50
,
sizeof
(
b
),
b
,
NULL
,
NULL
);
if
(
!
down_interruptible
(
&
dec
->
pes2ts_sem
))
{
dvb_filter_pes2ts_init
(
&
dec
->
a_pes2ts
,
dec
->
pid
[
DMX_PES_AUDIO
],
dvb_filter_pes2ts_init
(
&
dec
->
a_pes2ts
,
dec
->
pid
[
DMX_PES_AUDIO
],
ttusb_dec_av_pes2ts_cb
,
dec
->
demux
.
feed
);
ttusb_dec_av_pes2ts_cb
,
dec
->
demux
.
feed
);
dvb_filter_pes2ts_init
(
&
dec
->
v_pes2ts
,
dec
->
pid
[
DMX_PES_VIDEO
],
dvb_filter_pes2ts_init
(
&
dec
->
v_pes2ts
,
dec
->
pid
[
DMX_PES_VIDEO
],
ttusb_dec_av_pes2ts_cb
,
dec
->
demux
.
feed
);
ttusb_dec_av_pes2ts_cb
,
dec
->
demux
.
feed
);
up
(
&
dec
->
pes2ts_sem
);
}
}
}
static
int
ttusb_dec_i2c_master_xfer
(
struct
dvb_i2c_bus
*
i2c
,
static
int
ttusb_dec_i2c_master_xfer
(
struct
dvb_i2c_bus
*
i2c
,
...
@@ -196,14 +192,8 @@ static void ttusb_dec_process_av_pes(struct ttusb_dec * dec, u8 * av_pes,
...
@@ -196,14 +192,8 @@ static void ttusb_dec_process_av_pes(struct ttusb_dec * dec, u8 * av_pes,
memcpy
(
&
dec
->
v_pes
[
dec
->
v_pes_length
],
memcpy
(
&
dec
->
v_pes
[
dec
->
v_pes_length
],
&
av_pes
[
12
],
prebytes
);
&
av_pes
[
12
],
prebytes
);
if
(
!
down_interruptible
(
&
dec
->
pes2ts_sem
))
{
dvb_filter_pes2ts
(
&
dec
->
v_pes2ts
,
dec
->
v_pes
,
dvb_filter_pes2ts
(
&
dec
->
v_pes2ts
,
dec
->
v_pes_length
+
prebytes
);
dec
->
v_pes
,
dec
->
v_pes_length
+
prebytes
);
up
(
&
dec
->
pes2ts_sem
);
}
}
}
if
(
av_pes
[
5
]
&
0x10
)
{
if
(
av_pes
[
5
]
&
0x10
)
{
...
@@ -246,16 +236,10 @@ static void ttusb_dec_process_av_pes(struct ttusb_dec * dec, u8 * av_pes,
...
@@ -246,16 +236,10 @@ static void ttusb_dec_process_av_pes(struct ttusb_dec * dec, u8 * av_pes,
postbytes
);
postbytes
);
memcpy
(
&
dec
->
v_pes
[
4
],
&
v_pes_payload_length
,
2
);
memcpy
(
&
dec
->
v_pes
[
4
],
&
v_pes_payload_length
,
2
);
if
(
postbytes
==
0
)
{
if
(
postbytes
==
0
)
if
(
!
down_interruptible
(
&
dec
->
pes2ts_sem
))
{
dvb_filter_pes2ts
(
&
dec
->
v_pes2ts
,
dec
->
v_pes
,
dvb_filter_pes2ts
(
&
dec
->
v_pes2ts
,
dec
->
v_pes
,
dec
->
v_pes_length
);
dec
->
v_pes_length
);
up
(
&
dec
->
pes2ts_sem
);
}
}
break
;
break
;
}
}
...
@@ -357,6 +341,31 @@ static void ttusb_dec_process_urb_frame(struct ttusb_dec * dec, u8 * b,
...
@@ -357,6 +341,31 @@ static void ttusb_dec_process_urb_frame(struct ttusb_dec * dec, u8 * b,
}
}
}
}
static
void
ttusb_dec_process_urb_frame_list
(
unsigned
long
data
)
{
struct
ttusb_dec
*
dec
=
(
struct
ttusb_dec
*
)
data
;
struct
list_head
*
item
;
struct
urb_frame
*
frame
;
unsigned
long
flags
;
while
(
1
)
{
spin_lock_irqsave
(
&
dec
->
urb_frame_list_lock
,
flags
);
if
((
item
=
dec
->
urb_frame_list
.
next
)
!=
&
dec
->
urb_frame_list
)
{
frame
=
list_entry
(
item
,
struct
urb_frame
,
urb_frame_list
);
list_del
(
&
frame
->
urb_frame_list
);
}
else
{
spin_unlock_irqrestore
(
&
dec
->
urb_frame_list_lock
,
flags
);
return
;
}
spin_unlock_irqrestore
(
&
dec
->
urb_frame_list_lock
,
flags
);
ttusb_dec_process_urb_frame
(
dec
,
frame
->
data
,
frame
->
length
);
kfree
(
frame
);
}
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
static
void
ttusb_dec_process_urb
(
struct
urb
*
urb
)
static
void
ttusb_dec_process_urb
(
struct
urb
*
urb
)
#else
#else
...
@@ -372,12 +381,28 @@ static void ttusb_dec_process_urb(struct urb *urb, struct pt_regs *ptregs)
...
@@ -372,12 +381,28 @@ static void ttusb_dec_process_urb(struct urb *urb, struct pt_regs *ptregs)
struct
usb_iso_packet_descriptor
*
d
;
struct
usb_iso_packet_descriptor
*
d
;
u8
*
b
;
u8
*
b
;
int
length
;
int
length
;
struct
urb_frame
*
frame
;
d
=
&
urb
->
iso_frame_desc
[
i
];
d
=
&
urb
->
iso_frame_desc
[
i
];
b
=
urb
->
transfer_buffer
+
d
->
offset
;
b
=
urb
->
transfer_buffer
+
d
->
offset
;
length
=
d
->
actual_length
;
length
=
d
->
actual_length
;
ttusb_dec_process_urb_frame
(
dec
,
b
,
length
);
if
((
frame
=
kmalloc
(
sizeof
(
struct
urb_frame
),
GFP_ATOMIC
)))
{
unsigned
long
flags
;
memcpy
(
frame
->
data
,
b
,
length
);
frame
->
length
=
length
;
spin_lock_irqsave
(
&
dec
->
urb_frame_list_lock
,
flags
);
list_add_tail
(
&
frame
->
urb_frame_list
,
&
dec
->
urb_frame_list
);
spin_unlock_irqrestore
(
&
dec
->
urb_frame_list_lock
,
flags
);
tasklet_schedule
(
&
dec
->
urb_tasklet
);
}
}
}
}
else
{
}
else
{
/* -ENOENT is expected when unlinking urbs */
/* -ENOENT is expected when unlinking urbs */
...
@@ -653,6 +678,14 @@ static int ttusb_dec_alloc_iso_urbs(struct ttusb_dec *dec)
...
@@ -653,6 +678,14 @@ static int ttusb_dec_alloc_iso_urbs(struct ttusb_dec *dec)
return
0
;
return
0
;
}
}
static
void
ttusb_dec_init_tasklet
(
struct
ttusb_dec
*
dec
)
{
dec
->
urb_frame_list_lock
=
SPIN_LOCK_UNLOCKED
;
INIT_LIST_HEAD
(
&
dec
->
urb_frame_list
);
tasklet_init
(
&
dec
->
urb_tasklet
,
ttusb_dec_process_urb_frame_list
,
(
unsigned
long
)
dec
);
}
static
void
ttusb_dec_init_v_pes
(
struct
ttusb_dec
*
dec
)
static
void
ttusb_dec_init_v_pes
(
struct
ttusb_dec
*
dec
)
{
{
dprintk
(
"%s
\n
"
,
__FUNCTION__
);
dprintk
(
"%s
\n
"
,
__FUNCTION__
);
...
@@ -834,8 +867,6 @@ static int ttusb_dec_init_dvb(struct ttusb_dec *dec)
...
@@ -834,8 +867,6 @@ static int ttusb_dec_init_dvb(struct ttusb_dec *dec)
return
result
;
return
result
;
}
}
sema_init
(
&
dec
->
pes2ts_sem
,
1
);
dvb_net_init
(
dec
->
adapter
,
&
dec
->
dvb_net
,
&
dec
->
demux
.
dmx
);
dvb_net_init
(
dec
->
adapter
,
&
dec
->
dvb_net
,
&
dec
->
demux
.
dmx
);
return
0
;
return
0
;
...
@@ -868,6 +899,20 @@ static void ttusb_dec_exit_usb(struct ttusb_dec *dec)
...
@@ -868,6 +899,20 @@ static void ttusb_dec_exit_usb(struct ttusb_dec *dec)
ttusb_dec_free_iso_urbs
(
dec
);
ttusb_dec_free_iso_urbs
(
dec
);
}
}
static
void
ttusb_dec_exit_tasklet
(
struct
ttusb_dec
*
dec
)
{
struct
list_head
*
item
;
struct
urb_frame
*
frame
;
tasklet_kill
(
&
dec
->
urb_tasklet
);
while
((
item
=
dec
->
urb_frame_list
.
next
)
!=
&
dec
->
urb_frame_list
)
{
frame
=
list_entry
(
item
,
struct
urb_frame
,
urb_frame_list
);
list_del
(
&
frame
->
urb_frame_list
);
kfree
(
frame
);
}
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
static
void
*
ttusb_dec_probe
(
struct
usb_device
*
udev
,
unsigned
int
ifnum
,
static
void
*
ttusb_dec_probe
(
struct
usb_device
*
udev
,
unsigned
int
ifnum
,
const
struct
usb_device_id
*
id
)
const
struct
usb_device_id
*
id
)
...
@@ -892,6 +937,7 @@ static void *ttusb_dec_probe(struct usb_device *udev, unsigned int ifnum,
...
@@ -892,6 +937,7 @@ static void *ttusb_dec_probe(struct usb_device *udev, unsigned int ifnum,
ttusb_dec_init_stb
(
dec
);
ttusb_dec_init_stb
(
dec
);
ttusb_dec_init_dvb
(
dec
);
ttusb_dec_init_dvb
(
dec
);
ttusb_dec_init_v_pes
(
dec
);
ttusb_dec_init_v_pes
(
dec
);
ttusb_dec_init_tasklet
(
dec
);
return
(
void
*
)
dec
;
return
(
void
*
)
dec
;
}
}
...
@@ -919,6 +965,7 @@ static int ttusb_dec_probe(struct usb_interface *intf,
...
@@ -919,6 +965,7 @@ static int ttusb_dec_probe(struct usb_interface *intf,
ttusb_dec_init_stb
(
dec
);
ttusb_dec_init_stb
(
dec
);
ttusb_dec_init_dvb
(
dec
);
ttusb_dec_init_dvb
(
dec
);
ttusb_dec_init_v_pes
(
dec
);
ttusb_dec_init_v_pes
(
dec
);
ttusb_dec_init_tasklet
(
dec
);
usb_set_intfdata
(
intf
,
(
void
*
)
dec
);
usb_set_intfdata
(
intf
,
(
void
*
)
dec
);
ttusb_dec_set_streaming_interface
(
dec
);
ttusb_dec_set_streaming_interface
(
dec
);
...
@@ -941,6 +988,7 @@ static void ttusb_dec_disconnect(struct usb_interface *intf)
...
@@ -941,6 +988,7 @@ static void ttusb_dec_disconnect(struct usb_interface *intf)
dprintk
(
"%s
\n
"
,
__FUNCTION__
);
dprintk
(
"%s
\n
"
,
__FUNCTION__
);
ttusb_dec_exit_tasklet
(
dec
);
ttusb_dec_exit_usb
(
dec
);
ttusb_dec_exit_usb
(
dec
);
ttusb_dec_exit_dvb
(
dec
);
ttusb_dec_exit_dvb
(
dec
);
...
...
This diff is collapsed.
Click to expand it.
drivers/media/dvb/ttusb-dec/ttusb_dec.h
View file @
34861cdd
...
@@ -22,7 +22,10 @@
...
@@ -22,7 +22,10 @@
#ifndef _TTUSB_DEC_H
#ifndef _TTUSB_DEC_H
#define _TTUSB_DEC_H
#define _TTUSB_DEC_H
#include "asm/semaphore.h"
#include <asm/semaphore.h>
#include <linux/interrupt.h>
#include <linux/list.h>
#include <linux/spinlock.h>
#include "dmxdev.h"
#include "dmxdev.h"
#include "dvb_demux.h"
#include "dvb_demux.h"
#include "dvb_filter.h"
#include "dvb_filter.h"
...
@@ -77,11 +80,20 @@ struct ttusb_dec {
...
@@ -77,11 +80,20 @@ struct ttusb_dec {
struct
dvb_filter_pes2ts
a_pes2ts
;
struct
dvb_filter_pes2ts
a_pes2ts
;
struct
dvb_filter_pes2ts
v_pes2ts
;
struct
dvb_filter_pes2ts
v_pes2ts
;
struct
semaphore
pes2ts_sem
;
u8
v_pes
[
16
+
MAX_AV_PES_LENGTH
];
u8
v_pes
[
16
+
MAX_AV_PES_LENGTH
];
int
v_pes_length
;
int
v_pes_length
;
int
v_pes_postbytes
;
int
v_pes_postbytes
;
struct
list_head
urb_frame_list
;
struct
tasklet_struct
urb_tasklet
;
spinlock_t
urb_frame_list_lock
;
};
struct
urb_frame
{
u8
data
[
ISO_FRAME_SIZE
];
int
length
;
struct
list_head
urb_frame_list
;
};
};
#endif
#endif
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment