V4L/DVB: Remove obsolete zc0301 v4l driver
On 05/29/10 01:30, Jean-Francois Moine wrote: > On Fri, 28 May 2010 13:03:28 -0400 > Amerigo Wang<amwang@redhat.com> wrote: > >> Subject: [PATCH 6/6] Remove obsolete zc0301 v4l driver >> >> Duplicate functionality with the gspca_zc3xx driver, zc0301 only >> supports 2 USB-ID's (because it only supports a limited set of >> sensors) wich are also supported by the gspca_zc3xx driver >> (which supports 53 USB-ID's in total). > > You forgot to remove the conditionnal compilation in the gspca_zc3xx > driver (USB_DEVICE(0x046d, 0x08ae) in gspca/zc3xx.c) > Right, thanks for pointing this out! Attached is the updated patch, please use this one instead. Thanks! Duplicate functionality with the gspca_zc3xx driver, zc0301 only supports 2 USB-ID's (because it only supports a limited set of sensors) wich are also supported by the gspca_zc3xx driver (which supports 53 USB-ID's in total). Signed-off-by: Amerigo Wang <amwang@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Amerigo Wang
Mauro Carvalho Chehab
parent
a96076096b
commit
0d58cef664
|
|
@ -459,17 +459,6 @@ Who: Corentin Chary <corentin.chary@gmail.com>
|
|||
|
||||
----------------------------
|
||||
|
||||
What: zc0301 v4l driver
|
||||
When: 2.6.35
|
||||
Files: drivers/media/video/zc0301/*
|
||||
Why: Duplicate functionality with the gspca_zc3xx driver, zc0301 only
|
||||
supports 2 USB-ID's (because it only supports a limited set of
|
||||
sensors) wich are also supported by the gspca_zc3xx driver
|
||||
(which supports 53 USB-ID's in total)
|
||||
Who: Hans de Goede <hdegoede@redhat.com>
|
||||
|
||||
----------------------------
|
||||
|
||||
What: sysfs-class-rfkill state file
|
||||
When: Feb 2014
|
||||
Files: net/rfkill/core.c
|
||||
|
|
|
|||
|
|
@ -1014,8 +1014,6 @@ config USB_SE401
|
|||
|
||||
source "drivers/media/video/sn9c102/Kconfig"
|
||||
|
||||
source "drivers/media/video/zc0301/Kconfig"
|
||||
|
||||
source "drivers/media/video/pwc/Kconfig"
|
||||
|
||||
config USB_ZR364XX
|
||||
|
|
|
|||
|
|
@ -133,7 +133,6 @@ obj-$(CONFIG_USB_STKWEBCAM) += stkwebcam.o
|
|||
obj-$(CONFIG_USB_SN9C102) += sn9c102/
|
||||
obj-$(CONFIG_USB_ET61X251) += et61x251/
|
||||
obj-$(CONFIG_USB_PWC) += pwc/
|
||||
obj-$(CONFIG_USB_ZC0301) += zc0301/
|
||||
obj-$(CONFIG_USB_GSPCA) += gspca/
|
||||
|
||||
obj-$(CONFIG_VIDEO_HDPVR) += hdpvr/
|
||||
|
|
|
|||
|
|
@ -7193,9 +7193,7 @@ static const __devinitdata struct usb_device_id device_table[] = {
|
|||
{USB_DEVICE(0x046d, 0x08aa)},
|
||||
{USB_DEVICE(0x046d, 0x08ac)},
|
||||
{USB_DEVICE(0x046d, 0x08ad)},
|
||||
#if !defined CONFIG_USB_ZC0301 && !defined CONFIG_USB_ZC0301_MODULE
|
||||
{USB_DEVICE(0x046d, 0x08ae)},
|
||||
#endif
|
||||
{USB_DEVICE(0x046d, 0x08af)},
|
||||
{USB_DEVICE(0x046d, 0x08b9)},
|
||||
{USB_DEVICE(0x046d, 0x08d7)},
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
config USB_ZC0301
|
||||
tristate "USB ZC0301[P] webcam support (DEPRECATED)"
|
||||
depends on VIDEO_V4L2
|
||||
default n
|
||||
---help---
|
||||
This driver is DEPRECATED please use the gspca zc3xx module
|
||||
instead.
|
||||
|
||||
Say Y here if you want support for cameras based on the ZC0301 or
|
||||
ZC0301P Image Processors and Control Chips.
|
||||
|
||||
See <file:Documentation/video4linux/zc0301.txt> for more info.
|
||||
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called zc0301.
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
zc0301-objs := zc0301_core.o zc0301_pb0330.o zc0301_pas202bcb.o
|
||||
|
||||
obj-$(CONFIG_USB_ZC0301) += zc0301.o
|
||||
|
|
@ -1,196 +0,0 @@
|
|||
/***************************************************************************
|
||||
* V4L2 driver for ZC0301[P] Image Processor and Control Chip *
|
||||
* *
|
||||
* Copyright (C) 2006-2007 by Luca Risolia <luca.risolia@studio.unibo.it> *
|
||||
* *
|
||||
* 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. *
|
||||
***************************************************************************/
|
||||
|
||||
#ifndef _ZC0301_H_
|
||||
#define _ZC0301_H_
|
||||
|
||||
#include <linux/version.h>
|
||||
#include <linux/usb.h>
|
||||
#include <linux/videodev2.h>
|
||||
#include <media/v4l2-common.h>
|
||||
#include <media/v4l2-ioctl.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/list.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/time.h>
|
||||
#include <linux/wait.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/param.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/rwsem.h>
|
||||
#include <linux/stddef.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/kref.h>
|
||||
|
||||
#include "zc0301_sensor.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
#define ZC0301_DEBUG
|
||||
#define ZC0301_DEBUG_LEVEL 2
|
||||
#define ZC0301_MAX_DEVICES 64
|
||||
#define ZC0301_FORCE_MUNMAP 0
|
||||
#define ZC0301_MAX_FRAMES 32
|
||||
#define ZC0301_COMPRESSION_QUALITY 0
|
||||
#define ZC0301_URBS 2
|
||||
#define ZC0301_ISO_PACKETS 7
|
||||
#define ZC0301_ALTERNATE_SETTING 7
|
||||
#define ZC0301_URB_TIMEOUT msecs_to_jiffies(2 * ZC0301_ISO_PACKETS)
|
||||
#define ZC0301_CTRL_TIMEOUT 100
|
||||
#define ZC0301_FRAME_TIMEOUT 2
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
ZC0301_ID_TABLE
|
||||
ZC0301_SENSOR_TABLE
|
||||
|
||||
enum zc0301_frame_state {
|
||||
F_UNUSED,
|
||||
F_QUEUED,
|
||||
F_GRABBING,
|
||||
F_DONE,
|
||||
F_ERROR,
|
||||
};
|
||||
|
||||
struct zc0301_frame_t {
|
||||
void* bufmem;
|
||||
struct v4l2_buffer buf;
|
||||
enum zc0301_frame_state state;
|
||||
struct list_head frame;
|
||||
unsigned long vma_use_count;
|
||||
};
|
||||
|
||||
enum zc0301_dev_state {
|
||||
DEV_INITIALIZED = 0x01,
|
||||
DEV_DISCONNECTED = 0x02,
|
||||
DEV_MISCONFIGURED = 0x04,
|
||||
};
|
||||
|
||||
enum zc0301_io_method {
|
||||
IO_NONE,
|
||||
IO_READ,
|
||||
IO_MMAP,
|
||||
};
|
||||
|
||||
enum zc0301_stream_state {
|
||||
STREAM_OFF,
|
||||
STREAM_INTERRUPT,
|
||||
STREAM_ON,
|
||||
};
|
||||
|
||||
struct zc0301_module_param {
|
||||
u8 force_munmap;
|
||||
u16 frame_timeout;
|
||||
};
|
||||
|
||||
static DECLARE_RWSEM(zc0301_dev_lock);
|
||||
|
||||
struct zc0301_device {
|
||||
struct video_device* v4ldev;
|
||||
|
||||
struct zc0301_sensor sensor;
|
||||
|
||||
struct usb_device* usbdev;
|
||||
struct urb* urb[ZC0301_URBS];
|
||||
void* transfer_buffer[ZC0301_URBS];
|
||||
u8* control_buffer;
|
||||
|
||||
struct zc0301_frame_t *frame_current, frame[ZC0301_MAX_FRAMES];
|
||||
struct list_head inqueue, outqueue;
|
||||
u32 frame_count, nbuffers, nreadbuffers;
|
||||
|
||||
enum zc0301_io_method io;
|
||||
enum zc0301_stream_state stream;
|
||||
|
||||
struct v4l2_jpegcompression compression;
|
||||
|
||||
struct zc0301_module_param module_param;
|
||||
|
||||
struct kref kref;
|
||||
enum zc0301_dev_state state;
|
||||
u8 users;
|
||||
|
||||
struct completion probe;
|
||||
struct mutex open_mutex, fileop_mutex;
|
||||
spinlock_t queue_lock;
|
||||
wait_queue_head_t wait_open, wait_frame, wait_stream;
|
||||
};
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
struct zc0301_device*
|
||||
zc0301_match_id(struct zc0301_device* cam, const struct usb_device_id *id)
|
||||
{
|
||||
return usb_match_id(usb_ifnum_to_if(cam->usbdev, 0), id) ? cam : NULL;
|
||||
}
|
||||
|
||||
void
|
||||
zc0301_attach_sensor(struct zc0301_device* cam, struct zc0301_sensor* sensor)
|
||||
{
|
||||
memcpy(&cam->sensor, sensor, sizeof(struct zc0301_sensor));
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
#undef DBG
|
||||
#undef KDBG
|
||||
#ifdef ZC0301_DEBUG
|
||||
# define DBG(level, fmt, args...) \
|
||||
do { \
|
||||
if (debug >= (level)) { \
|
||||
if ((level) == 1) \
|
||||
dev_err(&cam->usbdev->dev, fmt "\n", ## args); \
|
||||
else if ((level) == 2) \
|
||||
dev_info(&cam->usbdev->dev, fmt "\n", ## args); \
|
||||
else if ((level) >= 3) \
|
||||
dev_info(&cam->usbdev->dev, "[%s:%s:%d] " fmt "\n", \
|
||||
__FILE__, __func__, __LINE__ , ## args); \
|
||||
} \
|
||||
} while (0)
|
||||
# define KDBG(level, fmt, args...) \
|
||||
do { \
|
||||
if (debug >= (level)) { \
|
||||
if ((level) == 1 || (level) == 2) \
|
||||
pr_info("zc0301: " fmt "\n", ## args); \
|
||||
else if ((level) == 3) \
|
||||
pr_debug("sn9c102: [%s:%s:%d] " fmt "\n", __FILE__, \
|
||||
__func__, __LINE__ , ## args); \
|
||||
} \
|
||||
} while (0)
|
||||
# define V4LDBG(level, name, cmd) \
|
||||
do { \
|
||||
if (debug >= (level)) \
|
||||
v4l_print_ioctl(name, cmd); \
|
||||
} while (0)
|
||||
#else
|
||||
# define DBG(level, fmt, args...) do {;} while(0)
|
||||
# define KDBG(level, fmt, args...) do {;} while(0)
|
||||
# define V4LDBG(level, name, cmd) do {;} while(0)
|
||||
#endif
|
||||
|
||||
#undef PDBG
|
||||
#define PDBG(fmt, args...) \
|
||||
dev_info(&cam->usbdev->dev, "[%s:%s:%d] " fmt "\n", __FILE__, __func__, \
|
||||
__LINE__ , ## args)
|
||||
|
||||
#undef PDBGG
|
||||
#define PDBGG(fmt, args...) do {;} while(0) /* placeholder */
|
||||
|
||||
#endif /* _ZC0301_H_ */
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,362 +0,0 @@
|
|||
/***************************************************************************
|
||||
* Plug-in for PAS202BCB image sensor connected to the ZC0301 Image *
|
||||
* Processor and Control Chip *
|
||||
* *
|
||||
* Copyright (C) 2006-2007 by Luca Risolia <luca.risolia@studio.unibo.it> *
|
||||
* *
|
||||
* Initialization values of the ZC0301[P] have been taken from the SPCA5XX *
|
||||
* driver maintained by Michel Xhaard <mxhaard@magic.fr> *
|
||||
* *
|
||||
* 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. *
|
||||
***************************************************************************/
|
||||
|
||||
/*
|
||||
NOTE: Sensor controls are disabled for now, becouse changing them while
|
||||
streaming sometimes results in out-of-sync video frames. We'll use
|
||||
the default initialization, until we know how to stop and start video
|
||||
in the chip. However, the image quality still looks good under various
|
||||
light conditions.
|
||||
*/
|
||||
|
||||
#include <linux/delay.h>
|
||||
#include "zc0301_sensor.h"
|
||||
|
||||
|
||||
static struct zc0301_sensor pas202bcb;
|
||||
|
||||
|
||||
static int pas202bcb_init(struct zc0301_device* cam)
|
||||
{
|
||||
int err = 0;
|
||||
|
||||
err += zc0301_write_reg(cam, 0x0002, 0x00);
|
||||
err += zc0301_write_reg(cam, 0x0003, 0x02);
|
||||
err += zc0301_write_reg(cam, 0x0004, 0x80);
|
||||
err += zc0301_write_reg(cam, 0x0005, 0x01);
|
||||
err += zc0301_write_reg(cam, 0x0006, 0xE0);
|
||||
err += zc0301_write_reg(cam, 0x0098, 0x00);
|
||||
err += zc0301_write_reg(cam, 0x009A, 0x03);
|
||||
err += zc0301_write_reg(cam, 0x011A, 0x00);
|
||||
err += zc0301_write_reg(cam, 0x011C, 0x03);
|
||||
err += zc0301_write_reg(cam, 0x009B, 0x01);
|
||||
err += zc0301_write_reg(cam, 0x009C, 0xE6);
|
||||
err += zc0301_write_reg(cam, 0x009D, 0x02);
|
||||
err += zc0301_write_reg(cam, 0x009E, 0x86);
|
||||
|
||||
err += zc0301_i2c_write(cam, 0x02, 0x02);
|
||||
err += zc0301_i2c_write(cam, 0x0A, 0x01);
|
||||
err += zc0301_i2c_write(cam, 0x0B, 0x01);
|
||||
err += zc0301_i2c_write(cam, 0x0D, 0x00);
|
||||
err += zc0301_i2c_write(cam, 0x12, 0x05);
|
||||
err += zc0301_i2c_write(cam, 0x13, 0x63);
|
||||
err += zc0301_i2c_write(cam, 0x15, 0x70);
|
||||
|
||||
err += zc0301_write_reg(cam, 0x0101, 0xB7);
|
||||
err += zc0301_write_reg(cam, 0x0100, 0x0D);
|
||||
err += zc0301_write_reg(cam, 0x0189, 0x06);
|
||||
err += zc0301_write_reg(cam, 0x01AD, 0x00);
|
||||
err += zc0301_write_reg(cam, 0x01C5, 0x03);
|
||||
err += zc0301_write_reg(cam, 0x01CB, 0x13);
|
||||
err += zc0301_write_reg(cam, 0x0250, 0x08);
|
||||
err += zc0301_write_reg(cam, 0x0301, 0x08);
|
||||
err += zc0301_write_reg(cam, 0x018D, 0x70);
|
||||
err += zc0301_write_reg(cam, 0x0008, 0x03);
|
||||
err += zc0301_write_reg(cam, 0x01C6, 0x04);
|
||||
err += zc0301_write_reg(cam, 0x01CB, 0x07);
|
||||
err += zc0301_write_reg(cam, 0x0120, 0x11);
|
||||
err += zc0301_write_reg(cam, 0x0121, 0x37);
|
||||
err += zc0301_write_reg(cam, 0x0122, 0x58);
|
||||
err += zc0301_write_reg(cam, 0x0123, 0x79);
|
||||
err += zc0301_write_reg(cam, 0x0124, 0x91);
|
||||
err += zc0301_write_reg(cam, 0x0125, 0xA6);
|
||||
err += zc0301_write_reg(cam, 0x0126, 0xB8);
|
||||
err += zc0301_write_reg(cam, 0x0127, 0xC7);
|
||||
err += zc0301_write_reg(cam, 0x0128, 0xD3);
|
||||
err += zc0301_write_reg(cam, 0x0129, 0xDE);
|
||||
err += zc0301_write_reg(cam, 0x012A, 0xE6);
|
||||
err += zc0301_write_reg(cam, 0x012B, 0xED);
|
||||
err += zc0301_write_reg(cam, 0x012C, 0xF3);
|
||||
err += zc0301_write_reg(cam, 0x012D, 0xF8);
|
||||
err += zc0301_write_reg(cam, 0x012E, 0xFB);
|
||||
err += zc0301_write_reg(cam, 0x012F, 0xFF);
|
||||
err += zc0301_write_reg(cam, 0x0130, 0x26);
|
||||
err += zc0301_write_reg(cam, 0x0131, 0x23);
|
||||
err += zc0301_write_reg(cam, 0x0132, 0x20);
|
||||
err += zc0301_write_reg(cam, 0x0133, 0x1C);
|
||||
err += zc0301_write_reg(cam, 0x0134, 0x16);
|
||||
err += zc0301_write_reg(cam, 0x0135, 0x13);
|
||||
err += zc0301_write_reg(cam, 0x0136, 0x10);
|
||||
err += zc0301_write_reg(cam, 0x0137, 0x0D);
|
||||
err += zc0301_write_reg(cam, 0x0138, 0x0B);
|
||||
err += zc0301_write_reg(cam, 0x0139, 0x09);
|
||||
err += zc0301_write_reg(cam, 0x013A, 0x07);
|
||||
err += zc0301_write_reg(cam, 0x013B, 0x06);
|
||||
err += zc0301_write_reg(cam, 0x013C, 0x05);
|
||||
err += zc0301_write_reg(cam, 0x013D, 0x04);
|
||||
err += zc0301_write_reg(cam, 0x013E, 0x03);
|
||||
err += zc0301_write_reg(cam, 0x013F, 0x02);
|
||||
err += zc0301_write_reg(cam, 0x010A, 0x4C);
|
||||
err += zc0301_write_reg(cam, 0x010B, 0xF5);
|
||||
err += zc0301_write_reg(cam, 0x010C, 0xFF);
|
||||
err += zc0301_write_reg(cam, 0x010D, 0xF9);
|
||||
err += zc0301_write_reg(cam, 0x010E, 0x51);
|
||||
err += zc0301_write_reg(cam, 0x010F, 0xF5);
|
||||
err += zc0301_write_reg(cam, 0x0110, 0xFB);
|
||||
err += zc0301_write_reg(cam, 0x0111, 0xED);
|
||||
err += zc0301_write_reg(cam, 0x0112, 0x5F);
|
||||
err += zc0301_write_reg(cam, 0x0180, 0x00);
|
||||
err += zc0301_write_reg(cam, 0x0019, 0x00);
|
||||
err += zc0301_write_reg(cam, 0x0087, 0x20);
|
||||
err += zc0301_write_reg(cam, 0x0088, 0x21);
|
||||
|
||||
err += zc0301_i2c_write(cam, 0x20, 0x02);
|
||||
err += zc0301_i2c_write(cam, 0x21, 0x1B);
|
||||
err += zc0301_i2c_write(cam, 0x03, 0x44);
|
||||
err += zc0301_i2c_write(cam, 0x0E, 0x01);
|
||||
err += zc0301_i2c_write(cam, 0x0F, 0x00);
|
||||
|
||||
err += zc0301_write_reg(cam, 0x01A9, 0x14);
|
||||
err += zc0301_write_reg(cam, 0x01AA, 0x24);
|
||||
err += zc0301_write_reg(cam, 0x0190, 0x00);
|
||||
err += zc0301_write_reg(cam, 0x0191, 0x02);
|
||||
err += zc0301_write_reg(cam, 0x0192, 0x1B);
|
||||
err += zc0301_write_reg(cam, 0x0195, 0x00);
|
||||
err += zc0301_write_reg(cam, 0x0196, 0x00);
|
||||
err += zc0301_write_reg(cam, 0x0197, 0x4D);
|
||||
err += zc0301_write_reg(cam, 0x018C, 0x10);
|
||||
err += zc0301_write_reg(cam, 0x018F, 0x20);
|
||||
err += zc0301_write_reg(cam, 0x001D, 0x44);
|
||||
err += zc0301_write_reg(cam, 0x001E, 0x6F);
|
||||
err += zc0301_write_reg(cam, 0x001F, 0xAD);
|
||||
err += zc0301_write_reg(cam, 0x0020, 0xEB);
|
||||
err += zc0301_write_reg(cam, 0x0087, 0x0F);
|
||||
err += zc0301_write_reg(cam, 0x0088, 0x0E);
|
||||
err += zc0301_write_reg(cam, 0x0180, 0x40);
|
||||
err += zc0301_write_reg(cam, 0x0192, 0x1B);
|
||||
err += zc0301_write_reg(cam, 0x0191, 0x02);
|
||||
err += zc0301_write_reg(cam, 0x0190, 0x00);
|
||||
err += zc0301_write_reg(cam, 0x0116, 0x1D);
|
||||
err += zc0301_write_reg(cam, 0x0117, 0x40);
|
||||
err += zc0301_write_reg(cam, 0x0118, 0x99);
|
||||
err += zc0301_write_reg(cam, 0x0180, 0x42);
|
||||
err += zc0301_write_reg(cam, 0x0116, 0x1D);
|
||||
err += zc0301_write_reg(cam, 0x0117, 0x40);
|
||||
err += zc0301_write_reg(cam, 0x0118, 0x99);
|
||||
err += zc0301_write_reg(cam, 0x0007, 0x00);
|
||||
|
||||
err += zc0301_i2c_write(cam, 0x11, 0x01);
|
||||
|
||||
msleep(100);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
|
||||
static int pas202bcb_get_ctrl(struct zc0301_device* cam,
|
||||
struct v4l2_control* ctrl)
|
||||
{
|
||||
switch (ctrl->id) {
|
||||
case V4L2_CID_EXPOSURE:
|
||||
{
|
||||
int r1 = zc0301_i2c_read(cam, 0x04, 1),
|
||||
r2 = zc0301_i2c_read(cam, 0x05, 1);
|
||||
if (r1 < 0 || r2 < 0)
|
||||
return -EIO;
|
||||
ctrl->value = (r1 << 6) | (r2 & 0x3f);
|
||||
}
|
||||
return 0;
|
||||
case V4L2_CID_RED_BALANCE:
|
||||
if ((ctrl->value = zc0301_i2c_read(cam, 0x09, 1)) < 0)
|
||||
return -EIO;
|
||||
ctrl->value &= 0x0f;
|
||||
return 0;
|
||||
case V4L2_CID_BLUE_BALANCE:
|
||||
if ((ctrl->value = zc0301_i2c_read(cam, 0x07, 1)) < 0)
|
||||
return -EIO;
|
||||
ctrl->value &= 0x0f;
|
||||
return 0;
|
||||
case V4L2_CID_GAIN:
|
||||
if ((ctrl->value = zc0301_i2c_read(cam, 0x10, 1)) < 0)
|
||||
return -EIO;
|
||||
ctrl->value &= 0x1f;
|
||||
return 0;
|
||||
case ZC0301_V4L2_CID_GREEN_BALANCE:
|
||||
if ((ctrl->value = zc0301_i2c_read(cam, 0x08, 1)) < 0)
|
||||
return -EIO;
|
||||
ctrl->value &= 0x0f;
|
||||
return 0;
|
||||
case ZC0301_V4L2_CID_DAC_MAGNITUDE:
|
||||
if ((ctrl->value = zc0301_i2c_read(cam, 0x0c, 1)) < 0)
|
||||
return -EIO;
|
||||
return 0;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static int pas202bcb_set_ctrl(struct zc0301_device* cam,
|
||||
const struct v4l2_control* ctrl)
|
||||
{
|
||||
int err = 0;
|
||||
|
||||
switch (ctrl->id) {
|
||||
case V4L2_CID_EXPOSURE:
|
||||
err += zc0301_i2c_write(cam, 0x04, ctrl->value >> 6);
|
||||
err += zc0301_i2c_write(cam, 0x05, ctrl->value & 0x3f);
|
||||
break;
|
||||
case V4L2_CID_RED_BALANCE:
|
||||
err += zc0301_i2c_write(cam, 0x09, ctrl->value);
|
||||
break;
|
||||
case V4L2_CID_BLUE_BALANCE:
|
||||
err += zc0301_i2c_write(cam, 0x07, ctrl->value);
|
||||
break;
|
||||
case V4L2_CID_GAIN:
|
||||
err += zc0301_i2c_write(cam, 0x10, ctrl->value);
|
||||
break;
|
||||
case ZC0301_V4L2_CID_GREEN_BALANCE:
|
||||
err += zc0301_i2c_write(cam, 0x08, ctrl->value);
|
||||
break;
|
||||
case ZC0301_V4L2_CID_DAC_MAGNITUDE:
|
||||
err += zc0301_i2c_write(cam, 0x0c, ctrl->value);
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
err += zc0301_i2c_write(cam, 0x11, 0x01);
|
||||
|
||||
return err ? -EIO : 0;
|
||||
}
|
||||
|
||||
|
||||
static struct zc0301_sensor pas202bcb = {
|
||||
.name = "PAS202BCB",
|
||||
.init = &pas202bcb_init,
|
||||
.qctrl = {
|
||||
{
|
||||
.id = V4L2_CID_EXPOSURE,
|
||||
.type = V4L2_CTRL_TYPE_INTEGER,
|
||||
.name = "exposure",
|
||||
.minimum = 0x01e5,
|
||||
.maximum = 0x3fff,
|
||||
.step = 0x0001,
|
||||
.default_value = 0x01e5,
|
||||
.flags = V4L2_CTRL_FLAG_DISABLED,
|
||||
},
|
||||
{
|
||||
.id = V4L2_CID_GAIN,
|
||||
.type = V4L2_CTRL_TYPE_INTEGER,
|
||||
.name = "global gain",
|
||||
.minimum = 0x00,
|
||||
.maximum = 0x1f,
|
||||
.step = 0x01,
|
||||
.default_value = 0x0c,
|
||||
.flags = V4L2_CTRL_FLAG_DISABLED,
|
||||
},
|
||||
{
|
||||
.id = ZC0301_V4L2_CID_DAC_MAGNITUDE,
|
||||
.type = V4L2_CTRL_TYPE_INTEGER,
|
||||
.name = "DAC magnitude",
|
||||
.minimum = 0x00,
|
||||
.maximum = 0xff,
|
||||
.step = 0x01,
|
||||
.default_value = 0x00,
|
||||
.flags = V4L2_CTRL_FLAG_DISABLED,
|
||||
},
|
||||
{
|
||||
.id = V4L2_CID_RED_BALANCE,
|
||||
.type = V4L2_CTRL_TYPE_INTEGER,
|
||||
.name = "red balance",
|
||||
.minimum = 0x00,
|
||||
.maximum = 0x0f,
|
||||
.step = 0x01,
|
||||
.default_value = 0x01,
|
||||
.flags = V4L2_CTRL_FLAG_DISABLED,
|
||||
},
|
||||
{
|
||||
.id = V4L2_CID_BLUE_BALANCE,
|
||||
.type = V4L2_CTRL_TYPE_INTEGER,
|
||||
.name = "blue balance",
|
||||
.minimum = 0x00,
|
||||
.maximum = 0x0f,
|
||||
.step = 0x01,
|
||||
.default_value = 0x05,
|
||||
.flags = V4L2_CTRL_FLAG_DISABLED,
|
||||
},
|
||||
{
|
||||
.id = ZC0301_V4L2_CID_GREEN_BALANCE,
|
||||
.type = V4L2_CTRL_TYPE_INTEGER,
|
||||
.name = "green balance",
|
||||
.minimum = 0x00,
|
||||
.maximum = 0x0f,
|
||||
.step = 0x01,
|
||||
.default_value = 0x00,
|
||||
.flags = V4L2_CTRL_FLAG_DISABLED,
|
||||
},
|
||||
},
|
||||
.get_ctrl = &pas202bcb_get_ctrl,
|
||||
.set_ctrl = &pas202bcb_set_ctrl,
|
||||
.cropcap = {
|
||||
.bounds = {
|
||||
.left = 0,
|
||||
.top = 0,
|
||||
.width = 640,
|
||||
.height = 480,
|
||||
},
|
||||
.defrect = {
|
||||
.left = 0,
|
||||
.top = 0,
|
||||
.width = 640,
|
||||
.height = 480,
|
||||
},
|
||||
},
|
||||
.pix_format = {
|
||||
.width = 640,
|
||||
.height = 480,
|
||||
.pixelformat = V4L2_PIX_FMT_JPEG,
|
||||
.priv = 8,
|
||||
.colorspace = V4L2_COLORSPACE_JPEG,
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
int zc0301_probe_pas202bcb(struct zc0301_device* cam)
|
||||
{
|
||||
int r0 = 0, r1 = 0, err = 0;
|
||||
unsigned int pid = 0;
|
||||
|
||||
err += zc0301_write_reg(cam, 0x0000, 0x01);
|
||||
err += zc0301_write_reg(cam, 0x0010, 0x0e);
|
||||
err += zc0301_write_reg(cam, 0x0001, 0x01);
|
||||
err += zc0301_write_reg(cam, 0x0012, 0x03);
|
||||
err += zc0301_write_reg(cam, 0x0012, 0x01);
|
||||
err += zc0301_write_reg(cam, 0x008d, 0x08);
|
||||
|
||||
msleep(10);
|
||||
|
||||
r0 = zc0301_i2c_read(cam, 0x00, 1);
|
||||
r1 = zc0301_i2c_read(cam, 0x01, 1);
|
||||
|
||||
if (r0 < 0 || r1 < 0 || err)
|
||||
return -EIO;
|
||||
|
||||
pid = (r0 << 4) | ((r1 & 0xf0) >> 4);
|
||||
if (pid != 0x017)
|
||||
return -ENODEV;
|
||||
|
||||
zc0301_attach_sensor(cam, &pas202bcb);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1,188 +0,0 @@
|
|||
/***************************************************************************
|
||||
* Plug-in for PB-0330 image sensor connected to the ZC0301P Image *
|
||||
* Processor and Control Chip *
|
||||
* *
|
||||
* Copyright (C) 2006-2007 by Luca Risolia <luca.risolia@studio.unibo.it> *
|
||||
* *
|
||||
* Initialization values of the ZC0301[P] have been taken from the SPCA5XX *
|
||||
* driver maintained by Michel Xhaard <mxhaard@magic.fr> *
|
||||
* *
|
||||
* 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. *
|
||||
***************************************************************************/
|
||||
|
||||
#include <linux/delay.h>
|
||||
#include "zc0301_sensor.h"
|
||||
|
||||
|
||||
static struct zc0301_sensor pb0330;
|
||||
|
||||
|
||||
static int pb0330_init(struct zc0301_device* cam)
|
||||
{
|
||||
int err = 0;
|
||||
|
||||
err += zc0301_write_reg(cam, 0x0000, 0x01);
|
||||
err += zc0301_write_reg(cam, 0x0008, 0x03);
|
||||
err += zc0301_write_reg(cam, 0x0010, 0x0A);
|
||||
err += zc0301_write_reg(cam, 0x0002, 0x00);
|
||||
err += zc0301_write_reg(cam, 0x0003, 0x02);
|
||||
err += zc0301_write_reg(cam, 0x0004, 0x80);
|
||||
err += zc0301_write_reg(cam, 0x0005, 0x01);
|
||||
err += zc0301_write_reg(cam, 0x0006, 0xE0);
|
||||
err += zc0301_write_reg(cam, 0x0001, 0x01);
|
||||
err += zc0301_write_reg(cam, 0x0012, 0x05);
|
||||
err += zc0301_write_reg(cam, 0x0012, 0x07);
|
||||
err += zc0301_write_reg(cam, 0x0098, 0x00);
|
||||
err += zc0301_write_reg(cam, 0x009A, 0x00);
|
||||
err += zc0301_write_reg(cam, 0x011A, 0x00);
|
||||
err += zc0301_write_reg(cam, 0x011C, 0x00);
|
||||
err += zc0301_write_reg(cam, 0x0012, 0x05);
|
||||
|
||||
err += zc0301_i2c_write(cam, 0x01, 0x0006);
|
||||
err += zc0301_i2c_write(cam, 0x02, 0x0011);
|
||||
err += zc0301_i2c_write(cam, 0x03, 0x01E7);
|
||||
err += zc0301_i2c_write(cam, 0x04, 0x0287);
|
||||
err += zc0301_i2c_write(cam, 0x06, 0x0003);
|
||||
err += zc0301_i2c_write(cam, 0x07, 0x3002);
|
||||
err += zc0301_i2c_write(cam, 0x20, 0x1100);
|
||||
err += zc0301_i2c_write(cam, 0x2F, 0xF7B0);
|
||||
err += zc0301_i2c_write(cam, 0x30, 0x0005);
|
||||
err += zc0301_i2c_write(cam, 0x31, 0x0000);
|
||||
err += zc0301_i2c_write(cam, 0x34, 0x0100);
|
||||
err += zc0301_i2c_write(cam, 0x35, 0x0060);
|
||||
err += zc0301_i2c_write(cam, 0x3D, 0x068F);
|
||||
err += zc0301_i2c_write(cam, 0x40, 0x01E0);
|
||||
err += zc0301_i2c_write(cam, 0x58, 0x0078);
|
||||
err += zc0301_i2c_write(cam, 0x62, 0x0411);
|
||||
|
||||
err += zc0301_write_reg(cam, 0x0087, 0x10);
|
||||
err += zc0301_write_reg(cam, 0x0101, 0x37);
|
||||
err += zc0301_write_reg(cam, 0x0012, 0x05);
|
||||
err += zc0301_write_reg(cam, 0x0100, 0x0D);
|
||||
err += zc0301_write_reg(cam, 0x0189, 0x06);
|
||||
err += zc0301_write_reg(cam, 0x01AD, 0x00);
|
||||
err += zc0301_write_reg(cam, 0x01C5, 0x03);
|
||||
err += zc0301_write_reg(cam, 0x01CB, 0x13);
|
||||
err += zc0301_write_reg(cam, 0x0250, 0x08);
|
||||
err += zc0301_write_reg(cam, 0x0301, 0x08);
|
||||
err += zc0301_write_reg(cam, 0x01A8, 0x60);
|
||||
err += zc0301_write_reg(cam, 0x018D, 0x6C);
|
||||
err += zc0301_write_reg(cam, 0x01AD, 0x09);
|
||||
err += zc0301_write_reg(cam, 0x01AE, 0x15);
|
||||
err += zc0301_write_reg(cam, 0x010A, 0x50);
|
||||
err += zc0301_write_reg(cam, 0x010B, 0xF8);
|
||||
err += zc0301_write_reg(cam, 0x010C, 0xF8);
|
||||
err += zc0301_write_reg(cam, 0x010D, 0xF8);
|
||||
err += zc0301_write_reg(cam, 0x010E, 0x50);
|
||||
err += zc0301_write_reg(cam, 0x010F, 0xF8);
|
||||
err += zc0301_write_reg(cam, 0x0110, 0xF8);
|
||||
err += zc0301_write_reg(cam, 0x0111, 0xF8);
|
||||
err += zc0301_write_reg(cam, 0x0112, 0x50);
|
||||
err += zc0301_write_reg(cam, 0x0008, 0x03);
|
||||
err += zc0301_write_reg(cam, 0x01C6, 0x08);
|
||||
err += zc0301_write_reg(cam, 0x01CB, 0x0F);
|
||||
err += zc0301_write_reg(cam, 0x010A, 0x50);
|
||||
err += zc0301_write_reg(cam, 0x010B, 0xF8);
|
||||
err += zc0301_write_reg(cam, 0x010C, 0xF8);
|
||||
err += zc0301_write_reg(cam, 0x010D, 0xF8);
|
||||
err += zc0301_write_reg(cam, 0x010E, 0x50);
|
||||
err += zc0301_write_reg(cam, 0x010F, 0xF8);
|
||||
err += zc0301_write_reg(cam, 0x0110, 0xF8);
|
||||
err += zc0301_write_reg(cam, 0x0111, 0xF8);
|
||||
err += zc0301_write_reg(cam, 0x0112, 0x50);
|
||||
err += zc0301_write_reg(cam, 0x0180, 0x00);
|
||||
err += zc0301_write_reg(cam, 0x0019, 0x00);
|
||||
|
||||
err += zc0301_i2c_write(cam, 0x05, 0x0066);
|
||||
err += zc0301_i2c_write(cam, 0x09, 0x02B2);
|
||||
err += zc0301_i2c_write(cam, 0x10, 0x0002);
|
||||
|
||||
err += zc0301_write_reg(cam, 0x011D, 0x60);
|
||||
err += zc0301_write_reg(cam, 0x0190, 0x00);
|
||||
err += zc0301_write_reg(cam, 0x0191, 0x07);
|
||||
err += zc0301_write_reg(cam, 0x0192, 0x8C);
|
||||
err += zc0301_write_reg(cam, 0x0195, 0x00);
|
||||
err += zc0301_write_reg(cam, 0x0196, 0x00);
|
||||
err += zc0301_write_reg(cam, 0x0197, 0x8A);
|
||||
err += zc0301_write_reg(cam, 0x018C, 0x10);
|
||||
err += zc0301_write_reg(cam, 0x018F, 0x20);
|
||||
err += zc0301_write_reg(cam, 0x01A9, 0x14);
|
||||
err += zc0301_write_reg(cam, 0x01AA, 0x24);
|
||||
err += zc0301_write_reg(cam, 0x001D, 0xD7);
|
||||
err += zc0301_write_reg(cam, 0x001E, 0xF0);
|
||||
err += zc0301_write_reg(cam, 0x001F, 0xF8);
|
||||
err += zc0301_write_reg(cam, 0x0020, 0xFF);
|
||||
err += zc0301_write_reg(cam, 0x01AD, 0x09);
|
||||
err += zc0301_write_reg(cam, 0x01AE, 0x15);
|
||||
err += zc0301_write_reg(cam, 0x0180, 0x40);
|
||||
err += zc0301_write_reg(cam, 0x0180, 0x42);
|
||||
|
||||
msleep(100);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
|
||||
static struct zc0301_sensor pb0330 = {
|
||||
.name = "PB-0330",
|
||||
.init = &pb0330_init,
|
||||
.cropcap = {
|
||||
.bounds = {
|
||||
.left = 0,
|
||||
.top = 0,
|
||||
.width = 640,
|
||||
.height = 480,
|
||||
},
|
||||
.defrect = {
|
||||
.left = 0,
|
||||
.top = 0,
|
||||
.width = 640,
|
||||
.height = 480,
|
||||
},
|
||||
},
|
||||
.pix_format = {
|
||||
.width = 640,
|
||||
.height = 480,
|
||||
.pixelformat = V4L2_PIX_FMT_JPEG,
|
||||
.priv = 8,
|
||||
.colorspace = V4L2_COLORSPACE_JPEG,
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
int zc0301_probe_pb0330(struct zc0301_device* cam)
|
||||
{
|
||||
int r0, err = 0;
|
||||
|
||||
err += zc0301_write_reg(cam, 0x0000, 0x01);
|
||||
err += zc0301_write_reg(cam, 0x0010, 0x0a);
|
||||
err += zc0301_write_reg(cam, 0x0001, 0x01);
|
||||
err += zc0301_write_reg(cam, 0x0012, 0x03);
|
||||
err += zc0301_write_reg(cam, 0x0012, 0x01);
|
||||
|
||||
msleep(10);
|
||||
|
||||
r0 = zc0301_i2c_read(cam, 0x00, 2);
|
||||
|
||||
if (r0 < 0 || err)
|
||||
return -EIO;
|
||||
|
||||
if (r0 != 0x8243)
|
||||
return -ENODEV;
|
||||
|
||||
zc0301_attach_sensor(cam, &pb0330);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1,107 +0,0 @@
|
|||
/***************************************************************************
|
||||
* API for image sensors connected to the ZC0301[P] Image Processor and *
|
||||
* Control Chip *
|
||||
* *
|
||||
* Copyright (C) 2006-2007 by Luca Risolia <luca.risolia@studio.unibo.it> *
|
||||
* *
|
||||
* 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. *
|
||||
***************************************************************************/
|
||||
|
||||
#ifndef _ZC0301_SENSOR_H_
|
||||
#define _ZC0301_SENSOR_H_
|
||||
|
||||
#include <linux/usb.h>
|
||||
#include <linux/videodev2.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/stddef.h>
|
||||
#include <linux/errno.h>
|
||||
#include <asm/types.h>
|
||||
|
||||
struct zc0301_device;
|
||||
struct zc0301_sensor;
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
extern int zc0301_probe_pas202bcb(struct zc0301_device* cam);
|
||||
extern int zc0301_probe_pb0330(struct zc0301_device* cam);
|
||||
|
||||
#define ZC0301_SENSOR_TABLE \
|
||||
/* Weak detections must go at the end of the list */ \
|
||||
static int (*zc0301_sensor_table[])(struct zc0301_device*) = { \
|
||||
&zc0301_probe_pas202bcb, \
|
||||
&zc0301_probe_pb0330, \
|
||||
NULL, \
|
||||
};
|
||||
|
||||
extern struct zc0301_device*
|
||||
zc0301_match_id(struct zc0301_device* cam, const struct usb_device_id *id);
|
||||
|
||||
extern void
|
||||
zc0301_attach_sensor(struct zc0301_device* cam, struct zc0301_sensor* sensor);
|
||||
|
||||
#define ZC0301_USB_DEVICE(vend, prod, intclass) \
|
||||
.match_flags = USB_DEVICE_ID_MATCH_DEVICE | \
|
||||
USB_DEVICE_ID_MATCH_INT_CLASS, \
|
||||
.idVendor = (vend), \
|
||||
.idProduct = (prod), \
|
||||
.bInterfaceClass = (intclass)
|
||||
|
||||
#if !defined CONFIG_USB_GSPCA_ZC3XX && !defined CONFIG_USB_GSPCA_ZC3XX_MODULE
|
||||
#define ZC0301_ID_TABLE \
|
||||
static const struct usb_device_id zc0301_id_table[] = { \
|
||||
{ ZC0301_USB_DEVICE(0x046d, 0x08ae, 0xff), }, /* PAS202 */ \
|
||||
{ ZC0301_USB_DEVICE(0x0ac8, 0x303b, 0xff), }, /* PB-0330 */ \
|
||||
{ } \
|
||||
};
|
||||
#else
|
||||
#define ZC0301_ID_TABLE \
|
||||
static const struct usb_device_id zc0301_id_table[] = { \
|
||||
{ ZC0301_USB_DEVICE(0x046d, 0x08ae, 0xff), }, /* PAS202 */ \
|
||||
{ } \
|
||||
};
|
||||
#endif
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
extern int zc0301_write_reg(struct zc0301_device*, u16 index, u16 value);
|
||||
extern int zc0301_read_reg(struct zc0301_device*, u16 index);
|
||||
extern int zc0301_i2c_write(struct zc0301_device*, u16 address, u16 value);
|
||||
extern int zc0301_i2c_read(struct zc0301_device*, u16 address, u8 length);
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
#define ZC0301_MAX_CTRLS (V4L2_CID_LASTP1 - V4L2_CID_BASE + 10)
|
||||
#define ZC0301_V4L2_CID_DAC_MAGNITUDE (V4L2_CID_PRIVATE_BASE + 0)
|
||||
#define ZC0301_V4L2_CID_GREEN_BALANCE (V4L2_CID_PRIVATE_BASE + 1)
|
||||
|
||||
struct zc0301_sensor {
|
||||
char name[32];
|
||||
|
||||
struct v4l2_queryctrl qctrl[ZC0301_MAX_CTRLS];
|
||||
struct v4l2_cropcap cropcap;
|
||||
struct v4l2_pix_format pix_format;
|
||||
|
||||
int (*init)(struct zc0301_device*);
|
||||
int (*get_ctrl)(struct zc0301_device*, struct v4l2_control* ctrl);
|
||||
int (*set_ctrl)(struct zc0301_device*,
|
||||
const struct v4l2_control* ctrl);
|
||||
int (*set_crop)(struct zc0301_device*, const struct v4l2_rect* rect);
|
||||
|
||||
/* Private */
|
||||
struct v4l2_queryctrl _qctrl[ZC0301_MAX_CTRLS];
|
||||
struct v4l2_rect _rect;
|
||||
};
|
||||
|
||||
#endif /* _ZC0301_SENSOR_H_ */
|
||||
Loading…
Reference in New Issue