diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-09-30 07:25:42 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-20 23:06:13 -0400 |
commit | 7af97effb3f5a374482179aca490b5038de56fa6 (patch) | |
tree | 70baf9a5fd787e44174bd738421447d30cc31e86 | |
parent | da497e30c161963c413e259438b1b54672055b11 (diff) |
V4L/DVB: Deprecate cpia driver (used for parallel port webcams)
cpia driver were re-written inside gspca driver, for USB devices. The only
functionality that were not migrated is the support for parallel port,
as:
1) the developer didn't find any hardware;
2) it doesn't seem important to keep support for a parallel port webcam,
as this is an obsolete technology;
3) the changes at gspca for it to work with parallel port would be very large;
4) this driver still uses BKL.
So, let's move it to drivers/staging and label it to die at 2.6.38, if nobody
cares enough to port parallel port support to gspca or to create a new driver
that uses the same gspca-cpia sub-driver.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | Documentation/feature-removal-schedule.txt | 17 | ||||
-rw-r--r-- | drivers/media/video/Kconfig | 40 | ||||
-rw-r--r-- | drivers/media/video/Makefile | 3 | ||||
-rw-r--r-- | drivers/staging/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/Makefile | 1 | ||||
-rw-r--r-- | drivers/staging/cpia/Kconfig | 39 | ||||
-rw-r--r-- | drivers/staging/cpia/Makefile | 5 | ||||
-rw-r--r-- | drivers/staging/cpia/TODO | 8 | ||||
-rw-r--r-- | drivers/staging/cpia/cpia.c (renamed from drivers/media/video/cpia.c) | 0 | ||||
-rw-r--r-- | drivers/staging/cpia/cpia.h (renamed from drivers/media/video/cpia.h) | 0 | ||||
-rw-r--r-- | drivers/staging/cpia/cpia_pp.c (renamed from drivers/media/video/cpia_pp.c) | 0 | ||||
-rw-r--r-- | drivers/staging/cpia/cpia_usb.c (renamed from drivers/media/video/cpia_usb.c) | 0 |
12 files changed, 71 insertions, 44 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 2372fb221969..448722555648 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
@@ -98,7 +98,7 @@ Who: Pavel Machek <pavel@ucw.cz> | |||
98 | --------------------------- | 98 | --------------------------- |
99 | 99 | ||
100 | What: Video4Linux API 1 ioctls and from Video devices. | 100 | What: Video4Linux API 1 ioctls and from Video devices. |
101 | When: July 2009 | 101 | When: kernel 2.6.38 |
102 | Files: include/linux/videodev.h | 102 | Files: include/linux/videodev.h |
103 | Check: include/linux/videodev.h | 103 | Check: include/linux/videodev.h |
104 | Why: V4L1 AP1 was replaced by V4L2 API during migration from 2.4 to 2.6 | 104 | Why: V4L1 AP1 was replaced by V4L2 API during migration from 2.4 to 2.6 |
@@ -116,6 +116,21 @@ Who: Mauro Carvalho Chehab <mchehab@infradead.org> | |||
116 | 116 | ||
117 | --------------------------- | 117 | --------------------------- |
118 | 118 | ||
119 | What: Video4Linux obsolete drivers using V4L1 API | ||
120 | When: kernel 2.6.38 | ||
121 | Files: drivers/staging/cpia/* | ||
122 | Check: drivers/staging/cpia/cpia.c | ||
123 | Why: There are some drivers still using V4L1 API, despite all efforts we've done | ||
124 | to migrate. Those drivers are for obsolete hardware that the old maintainer | ||
125 | didn't care (or not have the hardware anymore), and that no other developer | ||
126 | could find any hardware to buy. They probably have no practical usage today, | ||
127 | and people with such old hardware could probably keep using an older version | ||
128 | of the kernel. Those drivers will be moved to staging on 2.6.37 and, if nobody | ||
129 | care enough to port and test them with V4L2 API, they'll be removed on 2.6.38. | ||
130 | Who: Mauro Carvalho Chehab <mchehab@infradead.org> | ||
131 | |||
132 | --------------------------- | ||
133 | |||
119 | What: sys_sysctl | 134 | What: sys_sysctl |
120 | When: September 2010 | 135 | When: September 2010 |
121 | Option: CONFIG_SYSCTL_SYSCALL | 136 | Option: CONFIG_SYSCTL_SYSCALL |
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 2c0a8f776f8a..4f21ef877f37 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
@@ -599,46 +599,6 @@ config VIDEO_W9966 | |||
599 | Check out <file:Documentation/video4linux/w9966.txt> for more | 599 | Check out <file:Documentation/video4linux/w9966.txt> for more |
600 | information. | 600 | information. |
601 | 601 | ||
602 | config VIDEO_CPIA | ||
603 | tristate "CPiA Video For Linux (DEPRECATED)" | ||
604 | depends on VIDEO_V4L1 | ||
605 | default n | ||
606 | ---help--- | ||
607 | This driver is DEPRECATED please use the gspca cpia1 module | ||
608 | instead. Note that you need atleast version 0.6.4 of libv4l for | ||
609 | the cpia1 gspca module. | ||
610 | |||
611 | This is the video4linux driver for cameras based on Vision's CPiA | ||
612 | (Colour Processor Interface ASIC), such as the Creative Labs Video | ||
613 | Blaster Webcam II. If you have one of these cameras, say Y here | ||
614 | and select parallel port and/or USB lowlevel support below, | ||
615 | otherwise say N. This will not work with the Creative Webcam III. | ||
616 | |||
617 | Please read <file:Documentation/video4linux/README.cpia> for more | ||
618 | information. | ||
619 | |||
620 | This driver is also available as a module (cpia). | ||
621 | |||
622 | config VIDEO_CPIA_PP | ||
623 | tristate "CPiA Parallel Port Lowlevel Support" | ||
624 | depends on PARPORT_1284 && VIDEO_CPIA && PARPORT | ||
625 | help | ||
626 | This is the lowlevel parallel port support for cameras based on | ||
627 | Vision's CPiA (Colour Processor Interface ASIC), such as the | ||
628 | Creative Webcam II. If you have the parallel port version of one | ||
629 | of these cameras, say Y here, otherwise say N. It is also available | ||
630 | as a module (cpia_pp). | ||
631 | |||
632 | config VIDEO_CPIA_USB | ||
633 | tristate "CPiA USB Lowlevel Support" | ||
634 | depends on VIDEO_CPIA && USB | ||
635 | help | ||
636 | This is the lowlevel USB support for cameras based on Vision's CPiA | ||
637 | (Colour Processor Interface ASIC), such as the Creative Webcam II. | ||
638 | If you have the USB version of one of these cameras, say Y here, | ||
639 | otherwise say N. This will not work with the Creative Webcam III. | ||
640 | It is also available as a module (cpia_usb). | ||
641 | |||
642 | source "drivers/media/video/cpia2/Kconfig" | 602 | source "drivers/media/video/cpia2/Kconfig" |
643 | 603 | ||
644 | config VIDEO_VINO | 604 | config VIDEO_VINO |
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index a8f89899dd6b..b947160a8cb0 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile | |||
@@ -92,9 +92,6 @@ obj-$(CONFIG_VIDEO_W9966) += w9966.o | |||
92 | obj-$(CONFIG_VIDEO_PMS) += pms.o | 92 | obj-$(CONFIG_VIDEO_PMS) += pms.o |
93 | obj-$(CONFIG_VIDEO_VINO) += vino.o | 93 | obj-$(CONFIG_VIDEO_VINO) += vino.o |
94 | obj-$(CONFIG_VIDEO_STRADIS) += stradis.o | 94 | obj-$(CONFIG_VIDEO_STRADIS) += stradis.o |
95 | obj-$(CONFIG_VIDEO_CPIA) += cpia.o | ||
96 | obj-$(CONFIG_VIDEO_CPIA_PP) += cpia_pp.o | ||
97 | obj-$(CONFIG_VIDEO_CPIA_USB) += cpia_usb.o | ||
98 | obj-$(CONFIG_VIDEO_MEYE) += meye.o | 95 | obj-$(CONFIG_VIDEO_MEYE) += meye.o |
99 | obj-$(CONFIG_VIDEO_SAA7134) += saa7134/ | 96 | obj-$(CONFIG_VIDEO_SAA7134) += saa7134/ |
100 | obj-$(CONFIG_VIDEO_CX88) += cx88/ | 97 | obj-$(CONFIG_VIDEO_CX88) += cx88/ |
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig index 335311a98fdc..303c52cfe915 100644 --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig | |||
@@ -51,6 +51,8 @@ source "drivers/staging/cx25821/Kconfig" | |||
51 | 51 | ||
52 | source "drivers/staging/tm6000/Kconfig" | 52 | source "drivers/staging/tm6000/Kconfig" |
53 | 53 | ||
54 | source "drivers/staging/cpia/Kconfig" | ||
55 | |||
54 | source "drivers/staging/usbip/Kconfig" | 56 | source "drivers/staging/usbip/Kconfig" |
55 | 57 | ||
56 | source "drivers/staging/winbond/Kconfig" | 58 | source "drivers/staging/winbond/Kconfig" |
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index e3f1e1b6095e..ddcac245c99a 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile | |||
@@ -8,6 +8,7 @@ obj-$(CONFIG_SLICOSS) += slicoss/ | |||
8 | obj-$(CONFIG_VIDEO_GO7007) += go7007/ | 8 | obj-$(CONFIG_VIDEO_GO7007) += go7007/ |
9 | obj-$(CONFIG_VIDEO_CX25821) += cx25821/ | 9 | obj-$(CONFIG_VIDEO_CX25821) += cx25821/ |
10 | obj-$(CONFIG_VIDEO_TM6000) += tm6000/ | 10 | obj-$(CONFIG_VIDEO_TM6000) += tm6000/ |
11 | obj-$(CONFIG_VIDEO_CPIA) += cpia/ | ||
11 | obj-$(CONFIG_LIRC_STAGING) += lirc/ | 12 | obj-$(CONFIG_LIRC_STAGING) += lirc/ |
12 | obj-$(CONFIG_USB_IP_COMMON) += usbip/ | 13 | obj-$(CONFIG_USB_IP_COMMON) += usbip/ |
13 | obj-$(CONFIG_W35UND) += winbond/ | 14 | obj-$(CONFIG_W35UND) += winbond/ |
diff --git a/drivers/staging/cpia/Kconfig b/drivers/staging/cpia/Kconfig new file mode 100644 index 000000000000..205d247ad373 --- /dev/null +++ b/drivers/staging/cpia/Kconfig | |||
@@ -0,0 +1,39 @@ | |||
1 | config VIDEO_CPIA | ||
2 | tristate "CPiA Video For Linux (DEPRECATED)" | ||
3 | depends on VIDEO_V4L1 | ||
4 | default n | ||
5 | ---help--- | ||
6 | This driver is DEPRECATED please use the gspca cpia1 module | ||
7 | instead. Note that you need atleast version 0.6.4 of libv4l for | ||
8 | the cpia1 gspca module. | ||
9 | |||
10 | This is the video4linux driver for cameras based on Vision's CPiA | ||
11 | (Colour Processor Interface ASIC), such as the Creative Labs Video | ||
12 | Blaster Webcam II. If you have one of these cameras, say Y here | ||
13 | and select parallel port and/or USB lowlevel support below, | ||
14 | otherwise say N. This will not work with the Creative Webcam III. | ||
15 | |||
16 | Please read <file:Documentation/video4linux/README.cpia> for more | ||
17 | information. | ||
18 | |||
19 | This driver is also available as a module (cpia). | ||
20 | |||
21 | config VIDEO_CPIA_PP | ||
22 | tristate "CPiA Parallel Port Lowlevel Support" | ||
23 | depends on PARPORT_1284 && VIDEO_CPIA && PARPORT | ||
24 | help | ||
25 | This is the lowlevel parallel port support for cameras based on | ||
26 | Vision's CPiA (Colour Processor Interface ASIC), such as the | ||
27 | Creative Webcam II. If you have the parallel port version of one | ||
28 | of these cameras, say Y here, otherwise say N. It is also available | ||
29 | as a module (cpia_pp). | ||
30 | |||
31 | config VIDEO_CPIA_USB | ||
32 | tristate "CPiA USB Lowlevel Support" | ||
33 | depends on VIDEO_CPIA && USB | ||
34 | help | ||
35 | This is the lowlevel USB support for cameras based on Vision's CPiA | ||
36 | (Colour Processor Interface ASIC), such as the Creative Webcam II. | ||
37 | If you have the USB version of one of these cameras, say Y here, | ||
38 | otherwise say N. This will not work with the Creative Webcam III. | ||
39 | It is also available as a module (cpia_usb). | ||
diff --git a/drivers/staging/cpia/Makefile b/drivers/staging/cpia/Makefile new file mode 100644 index 000000000000..89e52f10d739 --- /dev/null +++ b/drivers/staging/cpia/Makefile | |||
@@ -0,0 +1,5 @@ | |||
1 | obj-$(CONFIG_VIDEO_CPIA) += cpia.o | ||
2 | obj-$(CONFIG_VIDEO_CPIA_PP) += cpia_pp.o | ||
3 | obj-$(CONFIG_VIDEO_CPIA_USB) += cpia_usb.o | ||
4 | |||
5 | EXTRA_CFLAGS += -Idrivers/media/video | ||
diff --git a/drivers/staging/cpia/TODO b/drivers/staging/cpia/TODO new file mode 100644 index 000000000000..ccb1c0775eec --- /dev/null +++ b/drivers/staging/cpia/TODO | |||
@@ -0,0 +1,8 @@ | |||
1 | This is an obsolete driver for some cpia-based webcams that use the parallel port. | ||
2 | We couldn't find anyone with this hardware in order to port it to use V4L2. | ||
3 | |||
4 | Also, parallel-port webcams are obsolete nowadays. | ||
5 | |||
6 | If nobody take care on it, the driver will be removed for 2.6.38. | ||
7 | |||
8 | Please send patches to linux-media@vger.kernel.org | ||
diff --git a/drivers/media/video/cpia.c b/drivers/staging/cpia/cpia.c index 933ae4c8cb9a..933ae4c8cb9a 100644 --- a/drivers/media/video/cpia.c +++ b/drivers/staging/cpia/cpia.c | |||
diff --git a/drivers/media/video/cpia.h b/drivers/staging/cpia/cpia.h index 8f0cfee4b8a1..8f0cfee4b8a1 100644 --- a/drivers/media/video/cpia.h +++ b/drivers/staging/cpia/cpia.h | |||
diff --git a/drivers/media/video/cpia_pp.c b/drivers/staging/cpia/cpia_pp.c index f5604c16a092..f5604c16a092 100644 --- a/drivers/media/video/cpia_pp.c +++ b/drivers/staging/cpia/cpia_pp.c | |||
diff --git a/drivers/media/video/cpia_usb.c b/drivers/staging/cpia/cpia_usb.c index 58d193ff591c..58d193ff591c 100644 --- a/drivers/media/video/cpia_usb.c +++ b/drivers/staging/cpia/cpia_usb.c | |||