diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2008-02-03 21:46:16 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 13:09:46 -0400 |
commit | 04910bdc5c172af9bc937a8869e7f2907db4443f (patch) | |
tree | b8b5f224510cca9938f2f766905622632f0f4861 /drivers/media/video/pvrusb2/pvrusb2-main.c | |
parent | e7f677f33664200b3d75ffc625d218b84ac43875 (diff) |
V4L/DVB (7679): pvrusb2: add DVB API framework
Add basic framework for the DVB API. This is enough to control the
tuner & demod of the digital frontend, but the stream & buffer handling
is still missing.
Additional note from Mike Isely <isely@pobox.com> - also, since these
changes are still very experimental arrange for DVB changes to be
compiled in via new CONFIG_VIDEO_PVRUSB2_DVB option, for now.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-main.c')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-main.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-main.c b/drivers/media/video/pvrusb2/pvrusb2-main.c index b63b2265503a..68f4a7480737 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-main.c +++ b/drivers/media/video/pvrusb2/pvrusb2-main.c | |||
@@ -60,6 +60,10 @@ static void pvr_setup_attach(struct pvr2_context *pvr) | |||
60 | { | 60 | { |
61 | /* Create association with v4l layer */ | 61 | /* Create association with v4l layer */ |
62 | pvr2_v4l2_create(pvr); | 62 | pvr2_v4l2_create(pvr); |
63 | #ifdef CONFIG_VIDEO_PVRUSB2_DVB | ||
64 | /* Create association with dvb layer */ | ||
65 | pvr2_dvb_init(pvr); | ||
66 | #endif | ||
63 | #ifdef CONFIG_VIDEO_PVRUSB2_SYSFS | 67 | #ifdef CONFIG_VIDEO_PVRUSB2_SYSFS |
64 | pvr2_sysfs_create(pvr,class_ptr); | 68 | pvr2_sysfs_create(pvr,class_ptr); |
65 | #endif /* CONFIG_VIDEO_PVRUSB2_SYSFS */ | 69 | #endif /* CONFIG_VIDEO_PVRUSB2_SYSFS */ |
@@ -95,6 +99,9 @@ static void pvr_disconnect(struct usb_interface *intf) | |||
95 | 99 | ||
96 | pvr2_trace(PVR2_TRACE_INIT,"pvr_disconnect(pvr=%p) BEGIN",pvr); | 100 | pvr2_trace(PVR2_TRACE_INIT,"pvr_disconnect(pvr=%p) BEGIN",pvr); |
97 | 101 | ||
102 | #ifdef CONFIG_VIDEO_PVRUSB2_DVB | ||
103 | pvr2_dvb_exit(pvr); | ||
104 | #endif | ||
98 | usb_set_intfdata (intf, NULL); | 105 | usb_set_intfdata (intf, NULL); |
99 | pvr2_context_disconnect(pvr); | 106 | pvr2_context_disconnect(pvr); |
100 | 107 | ||