V4L/DVB (4937): Usbvision cleanup and code reorganization
- removal of overlay stuff
- reorganization of functions in 3 files:
* usbvision-i2c for I2C-related stuff
* usbvision-video for v4l2 entry points
* usbvision-core for all peripheral controls and utilities
Signed-off-by: Thierry MERLE <thierry.merle@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Thierry MERLE
Mauro Carvalho Chehab
parent
d8159a3684
commit
483dfdb64f
|
|
@ -1,4 +1,4 @@
|
|||
usbvision-objs := usbvision-core.o usbvision-i2c.o usbvision-cards.o
|
||||
usbvision-objs := usbvision-core.o usbvision-video.o usbvision-i2c.o usbvision-cards.o
|
||||
|
||||
obj-$(CONFIG_VIDEO_USBVISION) += usbvision.o
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include "usbvision.h"
|
||||
|
||||
/* Supported Devices: A table for usbvision.c*/
|
||||
|
||||
struct usbvision_device_data_st usbvision_device_data[] = {
|
||||
{0xFFF0, 0xFFF0, -1, CODEC_SAA7111, 3, V4L2_STD_NTSC, 1, 1, 1, 1, TUNER_PHILIPS_NTSC_M, -1, -1, -1, -1, -1, "Custom Dummy USBVision Device"},
|
||||
{0x0A6F, 0x0400, -1, CODEC_SAA7113, 4, V4L2_STD_NTSC, 1, 0, 1, 0, 0, -1, -1, -1, -1, -1, "Xanboo"},
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -37,16 +37,18 @@
|
|||
#include <linux/sched.h>
|
||||
#include <linux/usb.h>
|
||||
#include <linux/i2c.h>
|
||||
#include "usbvision-i2c.h"
|
||||
#include "usbvision.h"
|
||||
|
||||
static int debug_i2c_usb = 0;
|
||||
#define DBG_I2C 1<<0
|
||||
#define DBG_ALGO 1<<1
|
||||
|
||||
#if defined(module_param) // Showing parameters under SYSFS
|
||||
module_param (debug_i2c_usb, int, 0444); // debug_i2c_usb mode of the device driver
|
||||
#else
|
||||
MODULE_PARM(debug_i2c_usb, "i"); // debug_i2c_usb mode of the device driver
|
||||
#endif
|
||||
static int i2c_debug = 0;
|
||||
|
||||
module_param (i2c_debug, int, 0644); // debug_i2c_usb mode of the device driver
|
||||
MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
|
||||
|
||||
#define PDEBUG(level, fmt, args...) \
|
||||
if (i2c_debug & (level)) info("[%s:%d] " fmt, __PRETTY_FUNCTION__, __LINE__ , ## args)
|
||||
|
||||
static inline int try_write_address(struct i2c_adapter *i2c_adap,
|
||||
unsigned char addr, int retries)
|
||||
|
|
@ -67,11 +69,9 @@ static inline int try_write_address(struct i2c_adapter *i2c_adap,
|
|||
break;
|
||||
udelay(adap->udelay);
|
||||
}
|
||||
if (debug_i2c_usb) {
|
||||
if (i) {
|
||||
info("%s: Needed %d retries for address %#2x", __FUNCTION__, i, addr);
|
||||
info("%s: Maybe there's no device at this address", __FUNCTION__);
|
||||
}
|
||||
if (i) {
|
||||
PDEBUG(DBG_ALGO,"Needed %d retries for address %#2x", i, addr);
|
||||
PDEBUG(DBG_ALGO,"Maybe there's no device at this address");
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -94,11 +94,9 @@ static inline int try_read_address(struct i2c_adapter *i2c_adap,
|
|||
break;
|
||||
udelay(adap->udelay);
|
||||
}
|
||||
if (debug_i2c_usb) {
|
||||
if (i) {
|
||||
info("%s: Needed %d retries for address %#2x", __FUNCTION__, i, addr);
|
||||
info("%s: Maybe there's no device at this address", __FUNCTION__);
|
||||
}
|
||||
if (i) {
|
||||
PDEBUG(DBG_ALGO,"Needed %d retries for address %#2x", i, addr);
|
||||
PDEBUG(DBG_ALGO,"Maybe there's no device at this address");
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -166,9 +164,7 @@ usb_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num)
|
|||
pmsg = &msgs[i];
|
||||
ret = usb_find_address(i2c_adap, pmsg, i2c_adap->retries, &addr);
|
||||
if (ret != 0) {
|
||||
if (debug_i2c_usb) {
|
||||
info("%s: got NAK from device, message #%d\n", __FUNCTION__, i);
|
||||
}
|
||||
PDEBUG(DBG_ALGO,"got NAK from device, message #%d", i);
|
||||
return (ret < 0) ? ret : -EREMOTEIO;
|
||||
}
|
||||
|
||||
|
|
@ -215,6 +211,9 @@ static struct i2c_algorithm i2c_usb_algo = {
|
|||
*/
|
||||
int usbvision_i2c_usb_add_bus(struct i2c_adapter *adap)
|
||||
{
|
||||
PDEBUG(DBG_I2C, "I2C debugging is enabled [i2c]");
|
||||
PDEBUG(DBG_ALGO, "ALGO debugging is enabled [i2c]");
|
||||
|
||||
/* register new adapter to i2c module... */
|
||||
|
||||
adap->algo = &i2c_usb_algo;
|
||||
|
|
@ -222,17 +221,9 @@ int usbvision_i2c_usb_add_bus(struct i2c_adapter *adap)
|
|||
adap->timeout = 100; /* default values, should */
|
||||
adap->retries = 3; /* be replaced by defines */
|
||||
|
||||
#ifdef MODULE
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21)
|
||||
MOD_INC_USE_COUNT;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
i2c_add_adapter(adap);
|
||||
|
||||
if (debug_i2c_usb) {
|
||||
info("i2c bus for %s registered", adap->name);
|
||||
}
|
||||
PDEBUG(DBG_ALGO,"i2c bus for %s registered", adap->name);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -243,17 +234,338 @@ int usbvision_i2c_usb_del_bus(struct i2c_adapter *adap)
|
|||
|
||||
i2c_del_adapter(adap);
|
||||
|
||||
if (debug_i2c_usb) {
|
||||
info("i2c bus for %s unregistered", adap->name);
|
||||
}
|
||||
#ifdef MODULE
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21)
|
||||
MOD_DEC_USE_COUNT;
|
||||
#endif
|
||||
#endif
|
||||
PDEBUG(DBG_ALGO,"i2c bus for %s unregistered", adap->name);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/* ----------------------------------------------------------------------- */
|
||||
/* usbvision specific I2C functions */
|
||||
/* ----------------------------------------------------------------------- */
|
||||
static struct i2c_adapter i2c_adap_template;
|
||||
static struct i2c_algo_usb_data i2c_algo_template;
|
||||
static struct i2c_client i2c_client_template;
|
||||
|
||||
int usbvision_init_i2c(struct usb_usbvision *usbvision)
|
||||
{
|
||||
memcpy(&usbvision->i2c_adap, &i2c_adap_template,
|
||||
sizeof(struct i2c_adapter));
|
||||
memcpy(&usbvision->i2c_algo, &i2c_algo_template,
|
||||
sizeof(struct i2c_algo_usb_data));
|
||||
memcpy(&usbvision->i2c_client, &i2c_client_template,
|
||||
sizeof(struct i2c_client));
|
||||
|
||||
sprintf(usbvision->i2c_adap.name + strlen(usbvision->i2c_adap.name),
|
||||
" #%d", usbvision->vdev->minor & 0x1f);
|
||||
PDEBUG(DBG_I2C,"Adaptername: %s", usbvision->i2c_adap.name);
|
||||
|
||||
i2c_set_adapdata(&usbvision->i2c_adap, usbvision);
|
||||
i2c_set_clientdata(&usbvision->i2c_client, usbvision);
|
||||
i2c_set_algo_usb_data(&usbvision->i2c_algo, usbvision);
|
||||
|
||||
usbvision->i2c_adap.algo_data = &usbvision->i2c_algo;
|
||||
usbvision->i2c_client.adapter = &usbvision->i2c_adap;
|
||||
|
||||
if (usbvision_write_reg(usbvision, USBVISION_SER_MODE, USBVISION_IIC_LRNACK) < 0) {
|
||||
printk(KERN_ERR "usbvision_init_i2c: can't write reg\n");
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_MODULES
|
||||
/* Request the load of the i2c modules we need */
|
||||
switch (usbvision_device_data[usbvision->DevModel].Codec) {
|
||||
case CODEC_SAA7113:
|
||||
request_module("saa7115");
|
||||
break;
|
||||
case CODEC_SAA7111:
|
||||
request_module("saa7115");
|
||||
break;
|
||||
}
|
||||
if (usbvision_device_data[usbvision->DevModel].Tuner == 1) {
|
||||
request_module("tuner");
|
||||
}
|
||||
#endif
|
||||
|
||||
return usbvision_i2c_usb_add_bus(&usbvision->i2c_adap);
|
||||
}
|
||||
|
||||
void call_i2c_clients(struct usb_usbvision *usbvision, unsigned int cmd,
|
||||
void *arg)
|
||||
{
|
||||
BUG_ON(NULL == usbvision->i2c_adap.algo_data);
|
||||
i2c_clients_command(&usbvision->i2c_adap, cmd, arg);
|
||||
}
|
||||
|
||||
static int attach_inform(struct i2c_client *client)
|
||||
{
|
||||
struct usb_usbvision *usbvision;
|
||||
|
||||
usbvision = (struct usb_usbvision *)i2c_get_adapdata(client->adapter);
|
||||
|
||||
switch (client->addr << 1) {
|
||||
case 0x43:
|
||||
case 0x4b:
|
||||
{
|
||||
struct tuner_setup tun_setup;
|
||||
|
||||
tun_setup.mode_mask = T_ANALOG_TV | T_RADIO;
|
||||
tun_setup.type = TUNER_TDA9887;
|
||||
tun_setup.addr = client->addr;
|
||||
|
||||
call_i2c_clients(usbvision, TUNER_SET_TYPE_ADDR, &tun_setup);
|
||||
|
||||
break;
|
||||
}
|
||||
case 0x42:
|
||||
PDEBUG(DBG_I2C,"attach_inform: saa7114 detected.");
|
||||
break;
|
||||
case 0x4a:
|
||||
PDEBUG(DBG_I2C,"attach_inform: saa7113 detected.");
|
||||
break;
|
||||
case 0xa0:
|
||||
PDEBUG(DBG_I2C,"attach_inform: eeprom detected.");
|
||||
break;
|
||||
|
||||
default:
|
||||
{
|
||||
struct tuner_setup tun_setup;
|
||||
|
||||
PDEBUG(DBG_I2C,"attach inform: detected I2C address %x", client->addr << 1);
|
||||
usbvision->tuner_addr = client->addr;
|
||||
|
||||
if ((usbvision->have_tuner) && (usbvision->tuner_type != -1)) {
|
||||
tun_setup.mode_mask = T_ANALOG_TV | T_RADIO;
|
||||
tun_setup.type = usbvision->tuner_type;
|
||||
tun_setup.addr = usbvision->tuner_addr;
|
||||
call_i2c_clients(usbvision, TUNER_SET_TYPE_ADDR, &tun_setup);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int detach_inform(struct i2c_client *client)
|
||||
{
|
||||
struct usb_usbvision *usbvision;
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
|
||||
usbvision = (struct usb_usbvision *)client->adapter->data;
|
||||
#else
|
||||
usbvision = (struct usb_usbvision *)i2c_get_adapdata(client->adapter);
|
||||
#endif
|
||||
|
||||
PDEBUG(DBG_I2C,"usbvision[%d] detaches %s", usbvision->nr, client->name);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
usbvision_i2c_read_max4(struct usb_usbvision *usbvision, unsigned char addr,
|
||||
char *buf, short len)
|
||||
{
|
||||
int rc, retries;
|
||||
|
||||
for (retries = 5;;) {
|
||||
rc = usbvision_write_reg(usbvision, USBVISION_SER_ADRS, addr);
|
||||
if (rc < 0)
|
||||
return rc;
|
||||
|
||||
/* Initiate byte read cycle */
|
||||
/* USBVISION_SER_CONT <- d0-d2 n. of bytes to r/w */
|
||||
/* d3 0=Wr 1=Rd */
|
||||
rc = usbvision_write_reg(usbvision, USBVISION_SER_CONT,
|
||||
(len & 0x07) | 0x18);
|
||||
if (rc < 0)
|
||||
return rc;
|
||||
|
||||
/* Test for Busy and ACK */
|
||||
do {
|
||||
/* USBVISION_SER_CONT -> d4 == 0 busy */
|
||||
rc = usbvision_read_reg(usbvision, USBVISION_SER_CONT);
|
||||
} while (rc > 0 && ((rc & 0x10) != 0)); /* Retry while busy */
|
||||
if (rc < 0)
|
||||
return rc;
|
||||
|
||||
/* USBVISION_SER_CONT -> d5 == 1 Not ack */
|
||||
if ((rc & 0x20) == 0) /* Ack? */
|
||||
break;
|
||||
|
||||
/* I2C abort */
|
||||
rc = usbvision_write_reg(usbvision, USBVISION_SER_CONT, 0x00);
|
||||
if (rc < 0)
|
||||
return rc;
|
||||
|
||||
if (--retries < 0)
|
||||
return -1;
|
||||
}
|
||||
|
||||
switch (len) {
|
||||
case 4:
|
||||
buf[3] = usbvision_read_reg(usbvision, USBVISION_SER_DAT4);
|
||||
case 3:
|
||||
buf[2] = usbvision_read_reg(usbvision, USBVISION_SER_DAT3);
|
||||
case 2:
|
||||
buf[1] = usbvision_read_reg(usbvision, USBVISION_SER_DAT2);
|
||||
case 1:
|
||||
buf[0] = usbvision_read_reg(usbvision, USBVISION_SER_DAT1);
|
||||
break;
|
||||
default:
|
||||
printk(KERN_ERR
|
||||
"usbvision_i2c_read_max4: buffer length > 4\n");
|
||||
}
|
||||
|
||||
if (i2c_debug & DBG_I2C) {
|
||||
int idx;
|
||||
for (idx = 0; idx < len; idx++) {
|
||||
PDEBUG(DBG_I2C,"read %x from address %x", (unsigned char)buf[idx], addr);
|
||||
}
|
||||
}
|
||||
return len;
|
||||
}
|
||||
|
||||
|
||||
static int usbvision_i2c_write_max4(struct usb_usbvision *usbvision,
|
||||
unsigned char addr, const char *buf,
|
||||
short len)
|
||||
{
|
||||
int rc, retries;
|
||||
int i;
|
||||
unsigned char value[6];
|
||||
unsigned char ser_cont;
|
||||
|
||||
ser_cont = (len & 0x07) | 0x10;
|
||||
|
||||
value[0] = addr;
|
||||
value[1] = ser_cont;
|
||||
for (i = 0; i < len; i++)
|
||||
value[i + 2] = buf[i];
|
||||
|
||||
for (retries = 5;;) {
|
||||
rc = usb_control_msg(usbvision->dev,
|
||||
usb_sndctrlpipe(usbvision->dev, 1),
|
||||
USBVISION_OP_CODE,
|
||||
USB_DIR_OUT | USB_TYPE_VENDOR |
|
||||
USB_RECIP_ENDPOINT, 0,
|
||||
(__u16) USBVISION_SER_ADRS, value,
|
||||
len + 2, HZ);
|
||||
|
||||
if (rc < 0)
|
||||
return rc;
|
||||
|
||||
rc = usbvision_write_reg(usbvision, USBVISION_SER_CONT,
|
||||
(len & 0x07) | 0x10);
|
||||
if (rc < 0)
|
||||
return rc;
|
||||
|
||||
/* Test for Busy and ACK */
|
||||
do {
|
||||
rc = usbvision_read_reg(usbvision, USBVISION_SER_CONT);
|
||||
} while (rc > 0 && ((rc & 0x10) != 0)); /* Retry while busy */
|
||||
if (rc < 0)
|
||||
return rc;
|
||||
|
||||
if ((rc & 0x20) == 0) /* Ack? */
|
||||
break;
|
||||
|
||||
/* I2C abort */
|
||||
usbvision_write_reg(usbvision, USBVISION_SER_CONT, 0x00);
|
||||
|
||||
if (--retries < 0)
|
||||
return -1;
|
||||
|
||||
}
|
||||
|
||||
if (i2c_debug & DBG_I2C) {
|
||||
int idx;
|
||||
for (idx = 0; idx < len; idx++) {
|
||||
PDEBUG(DBG_I2C,"wrote %x at address %x", (unsigned char)buf[idx], addr);
|
||||
}
|
||||
}
|
||||
return len;
|
||||
}
|
||||
|
||||
static int usbvision_i2c_write(void *data, unsigned char addr, char *buf,
|
||||
short len)
|
||||
{
|
||||
char *bufPtr = buf;
|
||||
int retval;
|
||||
int wrcount = 0;
|
||||
int count;
|
||||
int maxLen = 4;
|
||||
struct usb_usbvision *usbvision = (struct usb_usbvision *) data;
|
||||
|
||||
while (len > 0) {
|
||||
count = (len > maxLen) ? maxLen : len;
|
||||
retval = usbvision_i2c_write_max4(usbvision, addr, bufPtr, count);
|
||||
if (retval > 0) {
|
||||
len -= count;
|
||||
bufPtr += count;
|
||||
wrcount += count;
|
||||
} else
|
||||
return (retval < 0) ? retval : -EFAULT;
|
||||
}
|
||||
return wrcount;
|
||||
}
|
||||
|
||||
static int usbvision_i2c_read(void *data, unsigned char addr, char *buf,
|
||||
short len)
|
||||
{
|
||||
char temp[4];
|
||||
int retval, i;
|
||||
int rdcount = 0;
|
||||
int count;
|
||||
struct usb_usbvision *usbvision = (struct usb_usbvision *) data;
|
||||
|
||||
while (len > 0) {
|
||||
count = (len > 3) ? 4 : len;
|
||||
retval = usbvision_i2c_read_max4(usbvision, addr, temp, count);
|
||||
if (retval > 0) {
|
||||
for (i = 0; i < len; i++)
|
||||
buf[rdcount + i] = temp[i];
|
||||
len -= count;
|
||||
rdcount += count;
|
||||
} else
|
||||
return (retval < 0) ? retval : -EFAULT;
|
||||
}
|
||||
return rdcount;
|
||||
}
|
||||
|
||||
static struct i2c_algo_usb_data i2c_algo_template = {
|
||||
.data = NULL,
|
||||
.inb = usbvision_i2c_read,
|
||||
.outb = usbvision_i2c_write,
|
||||
.udelay = 10,
|
||||
.mdelay = 10,
|
||||
.timeout = 100,
|
||||
};
|
||||
|
||||
static struct i2c_adapter i2c_adap_template = {
|
||||
.owner = THIS_MODULE,
|
||||
.name = "usbvision",
|
||||
.id = I2C_HW_B_BT848, /* FIXME */
|
||||
.algo = NULL,
|
||||
.algo_data = NULL,
|
||||
.client_register = attach_inform,
|
||||
.client_unregister = detach_inform,
|
||||
#if defined (I2C_ADAP_CLASS_TV_ANALOG)
|
||||
.class = I2C_ADAP_CLASS_TV_ANALOG,
|
||||
#elif defined (I2C_CLASS_TV_ANALOG)
|
||||
.class = I2C_CLASS_TV_ANALOG,
|
||||
#endif
|
||||
};
|
||||
|
||||
static struct i2c_client i2c_client_template = {
|
||||
.name = "usbvision internal",
|
||||
};
|
||||
|
||||
EXPORT_SYMBOL(usbvision_i2c_usb_add_bus);
|
||||
EXPORT_SYMBOL(usbvision_i2c_usb_del_bus);
|
||||
|
||||
/*
|
||||
* Overrides for Emacs so that we follow Linus's tabbing style.
|
||||
* ---------------------------------------------------------------------------
|
||||
* Local variables:
|
||||
* c-basic-offset: 8
|
||||
* End:
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,58 +0,0 @@
|
|||
/*
|
||||
* I2C_ALGO_USB.H
|
||||
* i2c algorithm for USB-I2C Bridges
|
||||
*
|
||||
* Copyright (c) 1999-2005 Joerg Heckenbach <joerg@heckenbach-aw.de>
|
||||
*
|
||||
* This module is part of usbvision driver project.
|
||||
* Updates to driver completed by Dwaine P. Garden
|
||||
*
|
||||
* 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 I2C_ALGO_USB_H
|
||||
#define I2C_ALGO_USB_H 1
|
||||
|
||||
#include <linux/i2c.h>
|
||||
|
||||
struct i2c_algo_usb_data {
|
||||
void *data; /* private data for lowlevel routines */
|
||||
int (*inb) (void *data, unsigned char addr, char *buf, short len);
|
||||
int (*outb) (void *data, unsigned char addr, char *buf, short len);
|
||||
|
||||
/* local settings */
|
||||
int udelay;
|
||||
int mdelay;
|
||||
int timeout;
|
||||
};
|
||||
|
||||
#define I2C_USB_ADAP_MAX 16
|
||||
|
||||
int usbvision_i2c_usb_add_bus(struct i2c_adapter *);
|
||||
int usbvision_i2c_usb_del_bus(struct i2c_adapter *);
|
||||
|
||||
static inline void *i2c_get_algo_usb_data (struct i2c_algo_usb_data *dev)
|
||||
{
|
||||
return dev->data;
|
||||
}
|
||||
|
||||
static inline void i2c_set_algo_usb_data (struct i2c_algo_usb_data *dev, void *data)
|
||||
{
|
||||
dev->data = data;
|
||||
}
|
||||
|
||||
|
||||
#endif //I2C_ALGO_USB_H
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -28,7 +28,9 @@
|
|||
|
||||
#include <linux/list.h>
|
||||
#include <linux/usb.h>
|
||||
#include "usbvision-i2c.h"
|
||||
#include <media/v4l2-common.h>
|
||||
#include <media/tuner.h>
|
||||
#include <linux/videodev2.h>
|
||||
|
||||
#ifndef VID_HARDWARE_USBVISION
|
||||
#define VID_HARDWARE_USBVISION 34 /* USBVision Video Grabber */
|
||||
|
|
@ -139,11 +141,21 @@
|
|||
#define USBVISION_MAX_ISOC_PACKET_SIZE 959 // NT1003 Specs Document says 1023
|
||||
|
||||
#define USBVISION_NUM_HEADERMARKER 20
|
||||
#define USBVISION_NUMFRAMES 3
|
||||
#define USBVISION_NUMSBUF 2
|
||||
#define USBVISION_NUMFRAMES 3 /* Maximum number of frames an application can get */
|
||||
#define USBVISION_NUMSBUF 2 /* Dimensioning the USB S buffering */
|
||||
|
||||
#define USBVISION_POWEROFF_TIME 3 * (HZ) // 3 seconds
|
||||
|
||||
|
||||
#define FRAMERATE_MIN 0
|
||||
#define FRAMERATE_MAX 31
|
||||
|
||||
enum {
|
||||
ISOC_MODE_YUV422 = 0x03,
|
||||
ISOC_MODE_YUV420 = 0x14,
|
||||
ISOC_MODE_COMPRESS = 0x60,
|
||||
};
|
||||
|
||||
/* This macro restricts an int variable to an inclusive range */
|
||||
#define RESTRICT_TO_RANGE(v,mi,ma) { if ((v) < (mi)) (v) = (mi); else if ((v) > (ma)) (v) = (ma); }
|
||||
|
||||
|
|
@ -181,8 +193,6 @@
|
|||
mr = LIMIT_RGB(mm_r); \
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* Debugging aid */
|
||||
#define USBVISION_SAY_AND_WAIT(what) { \
|
||||
wait_queue_head_t wq; \
|
||||
|
|
@ -202,7 +212,23 @@
|
|||
((udevice)->last_error == 0) && \
|
||||
(!(udevice)->remove_pending))
|
||||
|
||||
/* I2C structures */
|
||||
struct i2c_algo_usb_data {
|
||||
void *data; /* private data for lowlevel routines */
|
||||
int (*inb) (void *data, unsigned char addr, char *buf, short len);
|
||||
int (*outb) (void *data, unsigned char addr, char *buf, short len);
|
||||
|
||||
/* local settings */
|
||||
int udelay;
|
||||
int mdelay;
|
||||
int timeout;
|
||||
};
|
||||
|
||||
#define I2C_USB_ADAP_MAX 16
|
||||
|
||||
/* ----------------------------------------------------------------- */
|
||||
/* usbvision video structures */
|
||||
/* ----------------------------------------------------------------- */
|
||||
enum ScanState {
|
||||
ScanState_Scanning, /* Scanning for header */
|
||||
ScanState_Lines /* Parsing lines */
|
||||
|
|
@ -347,7 +373,6 @@ struct usb_usbvision {
|
|||
struct video_device *vdev; /* Video Device */
|
||||
struct video_device *rdev; /* Radio Device */
|
||||
struct video_device *vbi; /* VBI Device */
|
||||
struct video_audio audio_dev; /* Current audio params */
|
||||
|
||||
/* i2c Declaration Section*/
|
||||
struct i2c_adapter i2c_adap;
|
||||
|
|
@ -361,6 +386,7 @@ struct usb_usbvision {
|
|||
wait_queue_head_t ctrlUrb_wq; // Processes waiting
|
||||
struct semaphore ctrlUrbLock;
|
||||
|
||||
/* configuration part */
|
||||
int have_tuner;
|
||||
int tuner_type;
|
||||
int tuner_addr;
|
||||
|
|
@ -372,7 +398,7 @@ struct usb_usbvision {
|
|||
int AudioMute;
|
||||
int AudioChannel;
|
||||
int isocMode; // format of video data for the usb isoc-transfer
|
||||
unsigned int nr; // Number of the device < MAX_USBVISION
|
||||
unsigned int nr; // Number of the device
|
||||
|
||||
/* Device structure */
|
||||
struct usb_device *dev;
|
||||
|
|
@ -384,7 +410,6 @@ struct usb_usbvision {
|
|||
struct work_struct powerOffWork;
|
||||
int power; /* is the device powered on? */
|
||||
int user; /* user count for exclusive use */
|
||||
int usbvision_used; /* Is this structure in use? */
|
||||
int initialized; /* Had we already sent init sequence? */
|
||||
int DevModel; /* What type of USBVISION device we got? */
|
||||
enum StreamState streaming; /* Are we streaming Isochronous? */
|
||||
|
|
@ -402,7 +427,6 @@ struct usb_usbvision {
|
|||
wait_queue_head_t wait_stream; /* Processes waiting */
|
||||
struct usbvision_frame *curFrame; // pointer to current frame, set by usbvision_find_header
|
||||
struct usbvision_frame frame[USBVISION_NUMFRAMES]; // frame buffer
|
||||
int curSbufNum; // number of current receiving sbuf
|
||||
struct usbvision_sbuf sbuf[USBVISION_NUMSBUF]; // S buffering
|
||||
volatile int remove_pending; /* If set then about to exit */
|
||||
|
||||
|
|
@ -413,13 +437,7 @@ struct usb_usbvision {
|
|||
int scratch_headermarker[USBVISION_NUM_HEADERMARKER];
|
||||
int scratch_headermarker_read_ptr;
|
||||
int scratch_headermarker_write_ptr;
|
||||
int isocstate;
|
||||
/* color controls */
|
||||
int saturation;
|
||||
int hue;
|
||||
int brightness;
|
||||
int contrast;
|
||||
int depth;
|
||||
enum IsocState isocstate;
|
||||
struct usbvision_v4l2_format_st palette;
|
||||
|
||||
struct v4l2_capability vcap; /* Video capabilities */
|
||||
|
|
@ -427,17 +445,6 @@ struct usb_usbvision {
|
|||
struct usbvision_tvnorm *tvnorm; /* selected tv norm */
|
||||
unsigned char video_endp; /* 0x82 for USBVISION devices based */
|
||||
|
||||
// Overlay stuff:
|
||||
struct v4l2_framebuffer vid_buf;
|
||||
struct v4l2_format vid_win;
|
||||
int vid_buf_valid; // Status: video buffer is valid (set)
|
||||
int vid_win_valid; // Status: video window is valid (set)
|
||||
int overlay; /*Status: Are we overlaying? */
|
||||
unsigned int clipmask[USBVISION_CLIPMASK_SIZE / 4];
|
||||
unsigned char *overlay_base; /* Virtual base address of video buffer */
|
||||
unsigned char *overlay_win; /* virt start address of overlay window */
|
||||
struct usbvision_frame overlay_frame;
|
||||
|
||||
// Decompression stuff:
|
||||
unsigned char *IntraFrameBuffer; /* Buffer for reference frame */
|
||||
int BlockPos; //for test only
|
||||
|
|
@ -449,16 +456,6 @@ struct usb_usbvision {
|
|||
int lastComprLevel; // How strong (100) or weak (0) was compression
|
||||
int usb_bandwidth; /* Mbit/s */
|
||||
|
||||
/* /proc entries, relative to /proc/video/usbvision/ */
|
||||
struct proc_dir_entry *proc_devdir; /* Per-device proc directory */
|
||||
struct proc_dir_entry *proc_info; /* <minor#>/info entry */
|
||||
struct proc_dir_entry *proc_register; /* <minor#>/register entry */
|
||||
struct proc_dir_entry *proc_freq; /* <minor#>/freq entry */
|
||||
struct proc_dir_entry *proc_input; /* <minor#>/input entry */
|
||||
struct proc_dir_entry *proc_frame; /* <minor#>/frame entry */
|
||||
struct proc_dir_entry *proc_button; /* <minor#>/button entry */
|
||||
struct proc_dir_entry *proc_control; /* <minor#>/control entry */
|
||||
|
||||
/* Statistics that can be overlayed on the screen */
|
||||
unsigned long isocUrbCount; // How many URBs we received so far
|
||||
unsigned long urb_length; /* Length of last URB */
|
||||
|
|
@ -479,6 +476,70 @@ struct usb_usbvision {
|
|||
int ComprBlockTypes[4];
|
||||
};
|
||||
|
||||
|
||||
/* --------------------------------------------------------------- */
|
||||
/* defined in usbvision-i2c.c */
|
||||
/* i2c-algo-usb declaration */
|
||||
/* --------------------------------------------------------------- */
|
||||
|
||||
int usbvision_i2c_usb_add_bus(struct i2c_adapter *);
|
||||
int usbvision_i2c_usb_del_bus(struct i2c_adapter *);
|
||||
|
||||
static inline void *i2c_get_algo_usb_data (struct i2c_algo_usb_data *dev)
|
||||
{
|
||||
return dev->data;
|
||||
}
|
||||
|
||||
static inline void i2c_set_algo_usb_data (struct i2c_algo_usb_data *dev, void *data)
|
||||
{
|
||||
dev->data = data;
|
||||
}
|
||||
|
||||
|
||||
/* ----------------------------------------------------------------------- */
|
||||
/* usbvision specific I2C functions */
|
||||
/* ----------------------------------------------------------------------- */
|
||||
int usbvision_init_i2c(struct usb_usbvision *usbvision);
|
||||
void call_i2c_clients(struct usb_usbvision *usbvision, unsigned int cmd,void *arg);
|
||||
|
||||
/* defined in usbvision-core.c */
|
||||
void *usbvision_rvmalloc(unsigned long size);
|
||||
void usbvision_rvfree(void *mem, unsigned long size);
|
||||
int usbvision_read_reg(struct usb_usbvision *usbvision, unsigned char reg);
|
||||
int usbvision_write_reg(struct usb_usbvision *usbvision, unsigned char reg,
|
||||
unsigned char value);
|
||||
|
||||
int usbvision_frames_alloc(struct usb_usbvision *usbvision);
|
||||
void usbvision_frames_free(struct usb_usbvision *usbvision);
|
||||
int usbvision_scratch_alloc(struct usb_usbvision *usbvision);
|
||||
void usbvision_scratch_free(struct usb_usbvision *usbvision);
|
||||
int usbvision_sbuf_alloc(struct usb_usbvision *usbvision);
|
||||
void usbvision_sbuf_free(struct usb_usbvision *usbvision);
|
||||
int usbvision_decompress_alloc(struct usb_usbvision *usbvision);
|
||||
void usbvision_decompress_free(struct usb_usbvision *usbvision);
|
||||
|
||||
int usbvision_setup(struct usb_usbvision *usbvision,int format);
|
||||
int usbvision_init_isoc(struct usb_usbvision *usbvision);
|
||||
int usbvision_restart_isoc(struct usb_usbvision *usbvision);
|
||||
void usbvision_stop_isoc(struct usb_usbvision *usbvision);
|
||||
|
||||
int usbvision_set_audio(struct usb_usbvision *usbvision, int AudioChannel);
|
||||
int usbvision_audio_off(struct usb_usbvision *usbvision);
|
||||
|
||||
int usbvision_begin_streaming(struct usb_usbvision *usbvision);
|
||||
void usbvision_empty_framequeues(struct usb_usbvision *dev);
|
||||
int usbvision_stream_interrupt(struct usb_usbvision *dev);
|
||||
|
||||
int usbvision_muxsel(struct usb_usbvision *usbvision, int channel);
|
||||
int usbvision_set_input(struct usb_usbvision *usbvision);
|
||||
int usbvision_set_output(struct usb_usbvision *usbvision, int width, int height);
|
||||
|
||||
void usbvision_init_powerOffTimer(struct usb_usbvision *usbvision);
|
||||
void usbvision_set_powerOffTimer(struct usb_usbvision *usbvision);
|
||||
void usbvision_reset_powerOffTimer(struct usb_usbvision *usbvision);
|
||||
int usbvision_power_off(struct usb_usbvision *usbvision);
|
||||
int usbvision_power_on(struct usb_usbvision *usbvision);
|
||||
|
||||
#endif /* __LINUX_USBVISION_H */
|
||||
|
||||
/*
|
||||
|
|
|
|||
Reference in New Issue