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>

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 1135996bec8b0465300c2935d3c40ee8593537fd..5e02b83ac12b6e19842f18a4c5017b4a0ee8ab31 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -64,10 +64,10 @@ Who:        Pavel Machek <pavel@suse.cz>
 
 ---------------------------
 
-What:  Video4Linux API 1 ioctls and video_decoder.h from Video devices.
-When:  December 2008
-Files: include/linux/video_decoder.h include/linux/videodev.h
-Check: include/linux/video_decoder.h include/linux/videodev.h
+What:  Video4Linux API 1 ioctls and from Video devices.
+When:  July 2009
+Files: include/linux/videodev.h
+Check: include/linux/videodev.h
 Why:   V4L1 AP1 was replaced by V4L2 API during migration from 2.4 to 2.6
        series. The old API have lots of drawbacks and don't provide enough
        means to work with all video and audio standards. The newer API is

diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index 3a311fe952ed1a0838ef0a959d1a42a81ad17169..1f779a25c703f68775b10d6aff74f18638cbcd37 100644 (file)
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@ -122,7 +122,6 @@ Code        Seq#    Include File            Comments
 'c'    00-7F   linux/coda.h            conflict!
 'c'    80-9F   arch/s390/include/asm/chsc.h
 'd'    00-FF   linux/char/drm/drm/h    conflict!
-'d'    00-DF   linux/video_decoder.h   conflict!
 'd'    F0-FF   linux/digi1.h
 'e'    all     linux/digi1.h           conflict!
 'e'    00-1F   net/irda/irtty.h        conflict!

diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c
index 996011f2aba532ac981b8c03eddd57bb2084e067..84aec62e84527675d8706596967fb2d14a8e7224 100644 (file)
--- a/drivers/media/video/mxb.c
+++ b/drivers/media/video/mxb.c
@@ -25,7 +25,6 @@
 
 #include <media/saa7146_vv.h>
 #include <media/tuner.h>
-#include <linux/video_decoder.h>
 #include <media/v4l2-common.h>
 #include <media/saa7115.h>
 

diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index da7ff0ba3860450e7082ed1c15ac830c8cddd69e..a67b6227d272b772d8c9f78703b27ed426f9c0d6 100644 (file)
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -158,7 +158,6 @@ header-y += ultrasound.h
 header-y += un.h
 header-y += utime.h
 header-y += veth.h
-header-y += video_decoder.h
 header-y += videotext.h
 header-y += x25.h
 

diff --git a/include/linux/video_decoder.h b/include/linux/video_decoder.h
deleted file mode 100644 (file)
index e26c0c8..0000000
--- a/include/linux/video_decoder.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef _LINUX_VIDEO_DECODER_H
-#define _LINUX_VIDEO_DECODER_H
-
-#include <linux/types.h>
-
-#define HAVE_VIDEO_DECODER 1
-
-struct video_decoder_capability { /* this name is too long */
-       __u32   flags;
-#define        VIDEO_DECODER_PAL       1       /* can decode PAL signal */
-#define        VIDEO_DECODER_NTSC      2       /* can decode NTSC */
-#define        VIDEO_DECODER_SECAM     4       /* can decode SECAM */
-#define        VIDEO_DECODER_AUTO      8       /* can autosense norm */
-#define        VIDEO_DECODER_CCIR      16      /* CCIR-601 pixel rate (720 pixels per line) instead of square pixel rate */
-       int     inputs;                 /* number of inputs */
-       int     outputs;                /* number of outputs */
-};
-
-/*
-DECODER_GET_STATUS returns the following flags.  The only one you need is
-DECODER_STATUS_GOOD, the others are just nice things to know.
-*/
-#define        DECODER_STATUS_GOOD     1       /* receiving acceptable input */
-#define        DECODER_STATUS_COLOR    2       /* receiving color information */
-#define        DECODER_STATUS_PAL      4       /* auto detected */
-#define        DECODER_STATUS_NTSC     8       /* auto detected */
-#define        DECODER_STATUS_SECAM    16      /* auto detected */
-
-struct video_decoder_init {
-       unsigned char len;
-       const unsigned char *data;
-};
-
-#define        DECODER_GET_CAPABILITIES _IOR('d', 1, struct video_decoder_capability)
-#define        DECODER_GET_STATUS      _IOR('d', 2, int)
-#define        DECODER_SET_NORM        _IOW('d', 3, int)
-#define        DECODER_SET_INPUT       _IOW('d', 4, int)       /* 0 <= input < #inputs */
-#define        DECODER_SET_OUTPUT      _IOW('d', 5, int)       /* 0 <= output < #outputs */
-#define        DECODER_ENABLE_OUTPUT   _IOW('d', 6, int)       /* boolean output enable control */
-#define        DECODER_SET_PICTURE     _IOW('d', 7, struct video_picture)
-#define        DECODER_SET_GPIO        _IOW('d', 8, int)       /* switch general purpose pin */
-#define        DECODER_INIT            _IOW('d', 9, struct video_decoder_init) /* init internal registers at once */
-#define        DECODER_SET_VBI_BYPASS  _IOW('d', 10, int)      /* switch vbi bypass */
-
-#define        DECODER_DUMP            _IO('d', 192)           /* debug hook */
-
-
-#endif