diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-04-02 12:35:00 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-06-25 00:57:38 -0400 |
commit | c7c0b34c27bbf0671807e902fbfea6270c8f138d (patch) | |
tree | 2d44aae2ae76ee47ca12262967ac5711bcc047b6 /include/media | |
parent | b7f8292c96463810edfecff70dd4631d47e5a36b (diff) |
V4L/DVB (3712): Fix video input setting of em28xx, use _INT_S_VIDEO_ROUTING in tvp5150
- Use new routing input defines in em28xx-cards.c
- Fix S-Video settings for tvp5150-based cards (input was copied from saa7115
based cards and worked only because S-Video was selected in the default: case)
- Replace VIDIOC_S_INPUT by VIDIOC_INT_S_VIDEO_ROUTING in em28xx-video.c
- Remove the now obsolete VIDIOC_S_INPUT handler in saa7115.c
- Add VIDIOC_INT_G/S_VIDEO_ROUTING in tvp5150.c
- Add new media/tvp5150.h with the routing defines.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/tvp5150.h | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/include/media/tvp5150.h b/include/media/tvp5150.h new file mode 100644 index 000000000000..72bd2a2b8bfd --- /dev/null +++ b/include/media/tvp5150.h | |||
@@ -0,0 +1,34 @@ | |||
1 | /* | ||
2 | tvp5150.h - definition for tvp5150 inputs | ||
3 | |||
4 | Copyright (C) 2006 Hans Verkuil (hverkuil@xs4all.nl) | ||
5 | |||
6 | This program is free software; you can redistribute it and/or modify | ||
7 | it under the terms of the GNU General Public License as published by | ||
8 | the Free Software Foundation; either version 2 of the License, or | ||
9 | (at your option) any later version. | ||
10 | |||
11 | This program is distributed in the hope that it will be useful, | ||
12 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | GNU General Public License for more details. | ||
15 | |||
16 | You should have received a copy of the GNU General Public License | ||
17 | along with this program; if not, write to the Free Software | ||
18 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
19 | */ | ||
20 | |||
21 | #ifndef _TVP5150_H_ | ||
22 | #define _TVP5150_H_ | ||
23 | |||
24 | /* TVP5150 HW inputs */ | ||
25 | #define TVP5150_COMPOSITE0 0 | ||
26 | #define TVP5150_COMPOSITE1 1 | ||
27 | #define TVP5150_SVIDEO 2 | ||
28 | |||
29 | /* TVP5150 HW outputs */ | ||
30 | #define TVP5150_NORMAL 0 | ||
31 | #define TVP5150_BLACK_SCREEN 1 | ||
32 | |||
33 | #endif | ||
34 | |||