V4L/DVB: Remove obsolete stv680 v4l1 driver
obsolete v4l1 driver replaced by gspca_stv0680 Signed-off-by: Amerigo Wang <amwang@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
3b23bc5731
commit
a96076096b
|
@ -459,14 +459,6 @@ Who: Corentin Chary <corentin.chary@gmail.com>
|
|||
|
||||
----------------------------
|
||||
|
||||
What: stv680 v4l1 driver
|
||||
When: 2.6.35
|
||||
Files: drivers/media/video/stv680.[ch]
|
||||
Why: obsolete v4l1 driver replaced by gspca_stv0680
|
||||
Who: Hans de Goede <hdegoede@redhat.com>
|
||||
|
||||
----------------------------
|
||||
|
||||
What: zc0301 v4l driver
|
||||
When: 2.6.35
|
||||
Files: drivers/media/video/zc0301/*
|
||||
|
|
|
@ -1014,23 +1014,6 @@ config USB_SE401
|
|||
|
||||
source "drivers/media/video/sn9c102/Kconfig"
|
||||
|
||||
config USB_STV680
|
||||
tristate "USB STV680 (Pencam) Camera support (DEPRECATED)"
|
||||
depends on VIDEO_V4L1
|
||||
default n
|
||||
---help---
|
||||
This driver is DEPRECATED please use the gspca stv0680 module
|
||||
instead. Note that for the gspca stv0680 module you need
|
||||
atleast version 0.6.3 of libv4l.
|
||||
|
||||
Say Y here if you want to connect this type of camera to your
|
||||
computer's USB port. This includes the Pencam line of cameras.
|
||||
See <file:Documentation/video4linux/stv680.txt> for more information
|
||||
and for a list of supported cameras.
|
||||
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called stv680.
|
||||
|
||||
source "drivers/media/video/zc0301/Kconfig"
|
||||
|
||||
source "drivers/media/video/pwc/Kconfig"
|
||||
|
|
|
@ -127,7 +127,6 @@ obj-$(CONFIG_VIDEO_CAFE_CCIC) += cafe_ccic.o
|
|||
|
||||
obj-$(CONFIG_USB_DABUSB) += dabusb.o
|
||||
obj-$(CONFIG_USB_SE401) += se401.o
|
||||
obj-$(CONFIG_USB_STV680) += stv680.o
|
||||
obj-$(CONFIG_USB_ZR364XX) += zr364xx.o
|
||||
obj-$(CONFIG_USB_STKWEBCAM) += stkwebcam.o
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,227 +0,0 @@
|
|||
/****************************************************************************
|
||||
*
|
||||
* Filename: stv680.h
|
||||
*
|
||||
* Description:
|
||||
* This is a USB driver for STV0680 based usb video cameras.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
/* size of usb transfers */
|
||||
#define STV680_PACKETSIZE 4096
|
||||
|
||||
/* number of queued bulk transfers to use, may have problems if > 1 */
|
||||
#define STV680_NUMSBUF 1
|
||||
|
||||
/* number of frames supported by the v4l part */
|
||||
#define STV680_NUMFRAMES 2
|
||||
|
||||
/* scratch buffers for passing data to the decoders: 2 or 4 are good */
|
||||
#define STV680_NUMSCRATCH 2
|
||||
|
||||
/* number of nul sized packets to receive before kicking the camera */
|
||||
#define STV680_MAX_NULLPACKETS 200
|
||||
|
||||
/* number of decoding errors before kicking the camera */
|
||||
#define STV680_MAX_ERRORS 100
|
||||
|
||||
#define USB_PENCAM_VENDOR_ID 0x0553
|
||||
#define USB_PENCAM_PRODUCT_ID 0x0202
|
||||
|
||||
#define USB_CREATIVEGOMINI_VENDOR_ID 0x041e
|
||||
#define USB_CREATIVEGOMINI_PRODUCT_ID 0x4007
|
||||
|
||||
#define PENCAM_TIMEOUT 1000
|
||||
/* fmt 4 */
|
||||
#define STV_VIDEO_PALETTE VIDEO_PALETTE_RGB24
|
||||
|
||||
static struct usb_device_id device_table[] = {
|
||||
{USB_DEVICE (USB_PENCAM_VENDOR_ID, USB_PENCAM_PRODUCT_ID)},
|
||||
{USB_DEVICE (USB_CREATIVEGOMINI_VENDOR_ID, USB_CREATIVEGOMINI_PRODUCT_ID)},
|
||||
{}
|
||||
};
|
||||
MODULE_DEVICE_TABLE (usb, device_table);
|
||||
|
||||
struct stv680_sbuf {
|
||||
unsigned char *data;
|
||||
};
|
||||
|
||||
enum {
|
||||
FRAME_UNUSED, /* Unused (no MCAPTURE) */
|
||||
FRAME_READY, /* Ready to start grabbing */
|
||||
FRAME_GRABBING, /* In the process of being grabbed into */
|
||||
FRAME_DONE, /* Finished grabbing, but not been synced yet */
|
||||
FRAME_ERROR, /* Something bad happened while processing */
|
||||
};
|
||||
|
||||
enum {
|
||||
BUFFER_UNUSED,
|
||||
BUFFER_READY,
|
||||
BUFFER_BUSY,
|
||||
BUFFER_DONE,
|
||||
};
|
||||
|
||||
/* raw camera data <- sbuf (urb transfer buf) */
|
||||
struct stv680_scratch {
|
||||
unsigned char *data;
|
||||
volatile int state;
|
||||
int offset;
|
||||
int length;
|
||||
};
|
||||
|
||||
/* processed data for display ends up here, after bayer */
|
||||
struct stv680_frame {
|
||||
unsigned char *data; /* Frame buffer */
|
||||
volatile int grabstate; /* State of grabbing */
|
||||
unsigned char *curline;
|
||||
int curlinepix;
|
||||
int curpix;
|
||||
};
|
||||
|
||||
/* this is almost the video structure uvd_t, with extra parameters for stv */
|
||||
struct usb_stv {
|
||||
struct video_device *vdev;
|
||||
|
||||
struct usb_device *udev;
|
||||
|
||||
unsigned char bulk_in_endpointAddr; /* __u8 the address of the bulk in endpoint */
|
||||
char *camera_name;
|
||||
|
||||
unsigned int VideoMode; /* 0x0100 = VGA, 0x0000 = CIF, 0x0300 = QVGA */
|
||||
int SupportedModes;
|
||||
int CIF;
|
||||
int VGA;
|
||||
int QVGA;
|
||||
int cwidth; /* camera width */
|
||||
int cheight; /* camera height */
|
||||
int maxwidth; /* max video width */
|
||||
int maxheight; /* max video height */
|
||||
int vwidth; /* current width for video window */
|
||||
int vheight; /* current height for video window */
|
||||
unsigned long int rawbufsize;
|
||||
unsigned long int maxframesize; /* rawbufsize * 3 for RGB */
|
||||
|
||||
int origGain;
|
||||
int origMode; /* original camera mode */
|
||||
|
||||
struct mutex lock; /* to lock the structure */
|
||||
int user; /* user count for exclusive use */
|
||||
int removed; /* device disconnected */
|
||||
int streaming; /* Are we streaming video? */
|
||||
char *fbuf; /* Videodev buffer area */
|
||||
struct urb *urb[STV680_NUMSBUF]; /* # of queued bulk transfers */
|
||||
int curframe; /* Current receiving frame */
|
||||
struct stv680_frame frame[STV680_NUMFRAMES]; /* # frames supported by v4l part */
|
||||
int readcount;
|
||||
int framecount;
|
||||
int error;
|
||||
int dropped;
|
||||
int scratch_next;
|
||||
int scratch_use;
|
||||
int scratch_overflow;
|
||||
struct stv680_scratch scratch[STV680_NUMSCRATCH]; /* for decoders */
|
||||
struct stv680_sbuf sbuf[STV680_NUMSBUF];
|
||||
|
||||
unsigned int brightness;
|
||||
unsigned int chgbright;
|
||||
unsigned int whiteness;
|
||||
unsigned int colour;
|
||||
unsigned int contrast;
|
||||
unsigned int hue;
|
||||
unsigned int palette;
|
||||
unsigned int depth; /* rgb24 in bits */
|
||||
|
||||
wait_queue_head_t wq; /* Processes waiting */
|
||||
|
||||
int nullpackets;
|
||||
};
|
||||
|
||||
|
||||
static const unsigned char red[256] = {
|
||||
0, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
|
||||
18, 18, 18, 18, 18, 18, 18, 25, 30, 35, 38, 42,
|
||||
44, 47, 50, 53, 54, 57, 59, 61, 63, 65, 67, 69,
|
||||
71, 71, 73, 75, 77, 78, 80, 81, 82, 84, 85, 87,
|
||||
88, 89, 90, 91, 93, 94, 95, 97, 98, 98, 99, 101,
|
||||
102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
|
||||
114, 115, 116, 116, 117, 118, 119, 120, 121, 122, 123, 124,
|
||||
125, 125, 126, 127, 128, 129, 129, 130, 131, 132, 133, 134,
|
||||
134, 135, 135, 136, 137, 138, 139, 140, 140, 141, 142, 143,
|
||||
143, 143, 144, 145, 146, 147, 147, 148, 149, 150, 150, 151,
|
||||
152, 152, 152, 153, 154, 154, 155, 156, 157, 157, 158, 159,
|
||||
159, 160, 161, 161, 161, 162, 163, 163, 164, 165, 165, 166,
|
||||
167, 167, 168, 168, 169, 170, 170, 170, 171, 171, 172, 173,
|
||||
173, 174, 174, 175, 176, 176, 177, 178, 178, 179, 179, 179,
|
||||
180, 180, 181, 181, 182, 183, 183, 184, 184, 185, 185, 186,
|
||||
187, 187, 188, 188, 188, 188, 189, 190, 190, 191, 191, 192,
|
||||
192, 193, 193, 194, 195, 195, 196, 196, 197, 197, 197, 197,
|
||||
198, 198, 199, 199, 200, 201, 201, 202, 202, 203, 203, 204,
|
||||
204, 205, 205, 206, 206, 206, 206, 207, 207, 208, 208, 209,
|
||||
209, 210, 210, 211, 211, 212, 212, 213, 213, 214, 214, 215,
|
||||
215, 215, 215, 216, 216, 217, 217, 218, 218, 218, 219, 219,
|
||||
220, 220, 221, 221
|
||||
};
|
||||
|
||||
static const unsigned char green[256] = {
|
||||
0, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
|
||||
21, 21, 21, 21, 21, 21, 21, 28, 34, 39, 43, 47,
|
||||
50, 53, 56, 59, 61, 64, 66, 68, 71, 73, 75, 77,
|
||||
79, 80, 82, 84, 86, 87, 89, 91, 92, 94, 95, 97,
|
||||
98, 100, 101, 102, 104, 105, 106, 108, 109, 110, 111, 113,
|
||||
114, 115, 116, 117, 118, 120, 121, 122, 123, 124, 125, 126,
|
||||
127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
|
||||
139, 140, 141, 142, 143, 144, 144, 145, 146, 147, 148, 149,
|
||||
150, 151, 151, 152, 153, 154, 155, 156, 156, 157, 158, 159,
|
||||
160, 160, 161, 162, 163, 164, 164, 165, 166, 167, 167, 168,
|
||||
169, 170, 170, 171, 172, 172, 173, 174, 175, 175, 176, 177,
|
||||
177, 178, 179, 179, 180, 181, 182, 182, 183, 184, 184, 185,
|
||||
186, 186, 187, 187, 188, 189, 189, 190, 191, 191, 192, 193,
|
||||
193, 194, 194, 195, 196, 196, 197, 198, 198, 199, 199, 200,
|
||||
201, 201, 202, 202, 203, 204, 204, 205, 205, 206, 206, 207,
|
||||
208, 208, 209, 209, 210, 210, 211, 212, 212, 213, 213, 214,
|
||||
214, 215, 215, 216, 217, 217, 218, 218, 219, 219, 220, 220,
|
||||
221, 221, 222, 222, 223, 224, 224, 225, 225, 226, 226, 227,
|
||||
227, 228, 228, 229, 229, 230, 230, 231, 231, 232, 232, 233,
|
||||
233, 234, 234, 235, 235, 236, 236, 237, 237, 238, 238, 239,
|
||||
239, 240, 240, 241, 241, 242, 242, 243, 243, 243, 244, 244,
|
||||
245, 245, 246, 246
|
||||
};
|
||||
|
||||
static const unsigned char blue[256] = {
|
||||
0, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
|
||||
23, 23, 23, 23, 23, 23, 23, 30, 37, 42, 47, 51,
|
||||
55, 58, 61, 64, 67, 70, 72, 74, 78, 80, 82, 84,
|
||||
86, 88, 90, 92, 94, 95, 97, 100, 101, 103, 104, 106,
|
||||
107, 110, 111, 112, 114, 115, 116, 118, 119, 121, 122, 124,
|
||||
125, 126, 127, 128, 129, 132, 133, 134, 135, 136, 137, 138,
|
||||
139, 140, 141, 143, 144, 145, 146, 147, 148, 149, 150, 151,
|
||||
152, 154, 155, 156, 157, 158, 158, 159, 160, 161, 162, 163,
|
||||
165, 166, 166, 167, 168, 169, 170, 171, 171, 172, 173, 174,
|
||||
176, 176, 177, 178, 179, 180, 180, 181, 182, 183, 183, 184,
|
||||
185, 187, 187, 188, 189, 189, 190, 191, 192, 192, 193, 194,
|
||||
194, 195, 196, 196, 198, 199, 200, 200, 201, 202, 202, 203,
|
||||
204, 204, 205, 205, 206, 207, 207, 209, 210, 210, 211, 212,
|
||||
212, 213, 213, 214, 215, 215, 216, 217, 217, 218, 218, 220,
|
||||
221, 221, 222, 222, 223, 224, 224, 225, 225, 226, 226, 227,
|
||||
228, 228, 229, 229, 231, 231, 232, 233, 233, 234, 234, 235,
|
||||
235, 236, 236, 237, 238, 238, 239, 239, 240, 240, 242, 242,
|
||||
243, 243, 244, 244, 245, 246, 246, 247, 247, 248, 248, 249,
|
||||
249, 250, 250, 251, 251, 253, 253, 254, 254, 255, 255, 255,
|
||||
255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
|
||||
255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
|
||||
255, 255, 255, 255
|
||||
};
|
Loading…
Reference in a new issue