Commit 42d12f5aa105af08bc0ed0580e32156a1a325c6b
1 parent
1f5b5cf600
Exists in
master
and in
39 other branches
V4L/DVB (10870a): remove all references for video_decoder.h
changeset 04934e44e3784a1b969582e2d59afcec278470c6 removed the last implementation that were still using the V4L1 obsoleted header. Now, video_decoder.h is not used anymore by any driver. Let's remove it and all references for it in Kernel. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Showing 5 changed files with 4 additions and 55 deletions Side-by-side Diff
Documentation/feature-removal-schedule.txt
| ... | ... | @@ -64,10 +64,10 @@ |
| 64 | 64 | |
| 65 | 65 | --------------------------- |
| 66 | 66 | |
| 67 | -What: Video4Linux API 1 ioctls and video_decoder.h from Video devices. | |
| 68 | -When: December 2008 | |
| 69 | -Files: include/linux/video_decoder.h include/linux/videodev.h | |
| 70 | -Check: include/linux/video_decoder.h include/linux/videodev.h | |
| 67 | +What: Video4Linux API 1 ioctls and from Video devices. | |
| 68 | +When: July 2009 | |
| 69 | +Files: include/linux/videodev.h | |
| 70 | +Check: include/linux/videodev.h | |
| 71 | 71 | Why: V4L1 AP1 was replaced by V4L2 API during migration from 2.4 to 2.6 |
| 72 | 72 | series. The old API have lots of drawbacks and don't provide enough |
| 73 | 73 | means to work with all video and audio standards. The newer API is |
Documentation/ioctl/ioctl-number.txt
| ... | ... | @@ -122,7 +122,6 @@ |
| 122 | 122 | 'c' 00-7F linux/coda.h conflict! |
| 123 | 123 | 'c' 80-9F arch/s390/include/asm/chsc.h |
| 124 | 124 | 'd' 00-FF linux/char/drm/drm/h conflict! |
| 125 | -'d' 00-DF linux/video_decoder.h conflict! | |
| 126 | 125 | 'd' F0-FF linux/digi1.h |
| 127 | 126 | 'e' all linux/digi1.h conflict! |
| 128 | 127 | 'e' 00-1F net/irda/irtty.h conflict! |
drivers/media/video/mxb.c
include/linux/Kbuild
include/linux/video_decoder.h
| 1 | -#ifndef _LINUX_VIDEO_DECODER_H | |
| 2 | -#define _LINUX_VIDEO_DECODER_H | |
| 3 | - | |
| 4 | -#include <linux/types.h> | |
| 5 | - | |
| 6 | -#define HAVE_VIDEO_DECODER 1 | |
| 7 | - | |
| 8 | -struct video_decoder_capability { /* this name is too long */ | |
| 9 | - __u32 flags; | |
| 10 | -#define VIDEO_DECODER_PAL 1 /* can decode PAL signal */ | |
| 11 | -#define VIDEO_DECODER_NTSC 2 /* can decode NTSC */ | |
| 12 | -#define VIDEO_DECODER_SECAM 4 /* can decode SECAM */ | |
| 13 | -#define VIDEO_DECODER_AUTO 8 /* can autosense norm */ | |
| 14 | -#define VIDEO_DECODER_CCIR 16 /* CCIR-601 pixel rate (720 pixels per line) instead of square pixel rate */ | |
| 15 | - int inputs; /* number of inputs */ | |
| 16 | - int outputs; /* number of outputs */ | |
| 17 | -}; | |
| 18 | - | |
| 19 | -/* | |
| 20 | -DECODER_GET_STATUS returns the following flags. The only one you need is | |
| 21 | -DECODER_STATUS_GOOD, the others are just nice things to know. | |
| 22 | -*/ | |
| 23 | -#define DECODER_STATUS_GOOD 1 /* receiving acceptable input */ | |
| 24 | -#define DECODER_STATUS_COLOR 2 /* receiving color information */ | |
| 25 | -#define DECODER_STATUS_PAL 4 /* auto detected */ | |
| 26 | -#define DECODER_STATUS_NTSC 8 /* auto detected */ | |
| 27 | -#define DECODER_STATUS_SECAM 16 /* auto detected */ | |
| 28 | - | |
| 29 | -struct video_decoder_init { | |
| 30 | - unsigned char len; | |
| 31 | - const unsigned char *data; | |
| 32 | -}; | |
| 33 | - | |
| 34 | -#define DECODER_GET_CAPABILITIES _IOR('d', 1, struct video_decoder_capability) | |
| 35 | -#define DECODER_GET_STATUS _IOR('d', 2, int) | |
| 36 | -#define DECODER_SET_NORM _IOW('d', 3, int) | |
| 37 | -#define DECODER_SET_INPUT _IOW('d', 4, int) /* 0 <= input < #inputs */ | |
| 38 | -#define DECODER_SET_OUTPUT _IOW('d', 5, int) /* 0 <= output < #outputs */ | |
| 39 | -#define DECODER_ENABLE_OUTPUT _IOW('d', 6, int) /* boolean output enable control */ | |
| 40 | -#define DECODER_SET_PICTURE _IOW('d', 7, struct video_picture) | |
| 41 | -#define DECODER_SET_GPIO _IOW('d', 8, int) /* switch general purpose pin */ | |
| 42 | -#define DECODER_INIT _IOW('d', 9, struct video_decoder_init) /* init internal registers at once */ | |
| 43 | -#define DECODER_SET_VBI_BYPASS _IOW('d', 10, int) /* switch vbi bypass */ | |
| 44 | - | |
| 45 | -#define DECODER_DUMP _IO('d', 192) /* debug hook */ | |
| 46 | - | |
| 47 | - | |
| 48 | -#endif |