diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-03-19 10:35:57 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-24 14:26:57 -0500 |
commit | 2474ed444b475614ef795523076be7cc8437ae00 (patch) | |
tree | 87808b3c7ff145b63a638e6e42ffce9db7db1b8c /drivers/media/video/msp3400-driver.h | |
parent | 49965a80a4c4f5cbe15fb3bb1f8f8b0ec4ef02bc (diff) |
V4L/DVB (3582): Implement correct msp3400 input/output routing
- implement VIDIOC_INT_S_AUDIO_ROUTING for msp3400 and tvaudio
- use the new command in bttv, pvrusb2 and em28xx.
- remove the now obsolete MSP_SET_MATRIX from msp3400 (yeah!)
- remove the obsolete VIDIOC_S_AUDIO from msp3400.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/msp3400-driver.h')
-rw-r--r-- | drivers/media/video/msp3400-driver.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/msp3400-driver.h b/drivers/media/video/msp3400-driver.h index 04821ebfe04a..1940748bb633 100644 --- a/drivers/media/video/msp3400-driver.h +++ b/drivers/media/video/msp3400-driver.h | |||
@@ -4,6 +4,8 @@ | |||
4 | #ifndef MSP3400_DRIVER_H | 4 | #ifndef MSP3400_DRIVER_H |
5 | #define MSP3400_DRIVER_H | 5 | #define MSP3400_DRIVER_H |
6 | 6 | ||
7 | #include <media/msp3400.h> | ||
8 | |||
7 | /* ---------------------------------------------------------------------- */ | 9 | /* ---------------------------------------------------------------------- */ |
8 | 10 | ||
9 | /* This macro is allowed for *constants* only, gcc must calculate it | 11 | /* This macro is allowed for *constants* only, gcc must calculate it |
@@ -72,7 +74,7 @@ struct msp_state { | |||
72 | int i2s_mode; | 74 | int i2s_mode; |
73 | int main, second; /* sound carrier */ | 75 | int main, second; /* sound carrier */ |
74 | int input; | 76 | int input; |
75 | int source; /* see msp34xxg_set_source */ | 77 | struct v4l2_routing routing; |
76 | 78 | ||
77 | /* v4l2 */ | 79 | /* v4l2 */ |
78 | int audmode; | 80 | int audmode; |