ukui/kernel
0
0
Fork 0
mirror of https://github.com/ukui/kernel.git synced 2026-03-09 10:07:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

V4L/DVB (10861): vino/indycam/saa7191: convert to i2c modules to V4L2.

Browse Source 
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil
2009-02-27 09:05:10 -03:00
committed by Mauro Carvalho Chehab
parent babb7dc777
commit cf4e9484f4
5 changed files with 256 additions and 647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

232
drivers/media/video/indycam.c
View File

@@ -19,10 +19,11 @@
#include <linux/mm.h>
#include <linux/slab.h>
#include <linux/videodev.h>
/* IndyCam decodes stream of photons into digital image representation ;-) */
#include <linux/video_decoder.h>
#include <linux/videodev2.h>
#include <linux/i2c.h>
#include <media/v4l2-common.h>
#include <media/v4l2-i2c-drv-legacy.h>
#include "indycam.h"
@@ -33,6 +34,10 @@ MODULE_VERSION(INDYCAM_MODULE_VERSION);
MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>");
MODULE_LICENSE("GPL");
static unsigned short normal_i2c[] = { 0x56 >> 1, I2C_CLIENT_END };
I2C_CLIENT_INSMOD;
// #define INDYCAM_DEBUG
#ifdef INDYCAM_DEBUG
@@ -48,8 +53,6 @@ struct indycam {
u8 version;
};
static struct i2c_driver i2c_driver_indycam;
static const u8 initseq[] = {
INDYCAM_CONTROL_AGCENA, /* INDYCAM_CONTROL */
INDYCAM_SHUTTER_60, /* INDYCAM_SHUTTER */
@@ -138,44 +141,44 @@ static void indycam_regdump_debug(struct i2c_client *client)
#endif
static int indycam_get_control(struct i2c_client *client,
struct indycam_control *ctrl)
struct v4l2_control *ctrl)
{
struct indycam *camera = i2c_get_clientdata(client);
u8 reg;
int ret = 0;
switch (ctrl->type) {
case INDYCAM_CONTROL_AGC:
case INDYCAM_CONTROL_AWB:
switch (ctrl->id) {
case V4L2_CID_AUTOGAIN:
case V4L2_CID_AUTO_WHITE_BALANCE:
ret = indycam_read_reg(client, INDYCAM_REG_CONTROL, &reg);
if (ret)
return -EIO;
if (ctrl->type == INDYCAM_CONTROL_AGC)
if (ctrl->id == V4L2_CID_AUTOGAIN)
ctrl->value = (reg & INDYCAM_CONTROL_AGCENA)
? 1 : 0;
else
ctrl->value = (reg & INDYCAM_CONTROL_AWBCTL)
? 1 : 0;
break;
case INDYCAM_CONTROL_SHUTTER:
case V4L2_CID_EXPOSURE:
ret = indycam_read_reg(client, INDYCAM_REG_SHUTTER, &reg);
if (ret)
return -EIO;
ctrl->value = ((s32)reg == 0x00) ? 0xff : ((s32)reg - 1);
break;
case INDYCAM_CONTROL_GAIN:
case V4L2_CID_GAIN:
ret = indycam_read_reg(client, INDYCAM_REG_GAIN, &reg);
if (ret)
return -EIO;
ctrl->value = (s32)reg;
break;
case INDYCAM_CONTROL_RED_BALANCE:
case V4L2_CID_RED_BALANCE:
ret = indycam_read_reg(client, INDYCAM_REG_RED_BALANCE, &reg);
if (ret)
return -EIO;
ctrl->value = (s32)reg;
break;
case INDYCAM_CONTROL_BLUE_BALANCE:
case V4L2_CID_BLUE_BALANCE:
ret = indycam_read_reg(client, INDYCAM_REG_BLUE_BALANCE, &reg);
if (ret)
return -EIO;
@@ -195,7 +198,7 @@ static int indycam_get_control(struct i2c_client *client,
return -EIO;
ctrl->value = (s32)reg;
break;
case INDYCAM_CONTROL_GAMMA:
case V4L2_CID_GAMMA:
if (camera->version == CAMERA_VERSION_MOOSE) {
ret = indycam_read_reg(client,
INDYCAM_REG_GAMMA, &reg);
@@ -214,20 +217,20 @@ static int indycam_get_control(struct i2c_client *client,
}
static int indycam_set_control(struct i2c_client *client,
struct indycam_control *ctrl)
struct v4l2_control *ctrl)
{
struct indycam *camera = i2c_get_clientdata(client);
u8 reg;
int ret = 0;
switch (ctrl->type) {
case INDYCAM_CONTROL_AGC:
case INDYCAM_CONTROL_AWB:
switch (ctrl->id) {
case V4L2_CID_AUTOGAIN:
case V4L2_CID_AUTO_WHITE_BALANCE:
ret = indycam_read_reg(client, INDYCAM_REG_CONTROL, &reg);
if (ret)
break;
if (ctrl->type == INDYCAM_CONTROL_AGC) {
if (ctrl->id == V4L2_CID_AUTOGAIN) {
if (ctrl->value)
reg |= INDYCAM_CONTROL_AGCENA;
else
@@ -241,18 +244,18 @@ static int indycam_set_control(struct i2c_client *client,
ret = indycam_write_reg(client, INDYCAM_REG_CONTROL, reg);
break;
case INDYCAM_CONTROL_SHUTTER:
case V4L2_CID_EXPOSURE:
reg = (ctrl->value == 0xff) ? 0x00 : (ctrl->value + 1);
ret = indycam_write_reg(client, INDYCAM_REG_SHUTTER, reg);
break;
case INDYCAM_CONTROL_GAIN:
case V4L2_CID_GAIN:
ret = indycam_write_reg(client, INDYCAM_REG_GAIN, ctrl->value);
break;
case INDYCAM_CONTROL_RED_BALANCE:
case V4L2_CID_RED_BALANCE:
ret = indycam_write_reg(client, INDYCAM_REG_RED_BALANCE,
ctrl->value);
break;
case INDYCAM_CONTROL_BLUE_BALANCE:
case V4L2_CID_BLUE_BALANCE:
ret = indycam_write_reg(client, INDYCAM_REG_BLUE_BALANCE,
ctrl->value);
break;
@@ -264,7 +267,7 @@ static int indycam_set_control(struct i2c_client *client,
ret = indycam_write_reg(client, INDYCAM_REG_BLUE_SATURATION,
ctrl->value);
break;
case INDYCAM_CONTROL_GAMMA:
case V4L2_CID_GAMMA:
if (camera->version == CAMERA_VERSION_MOOSE) {
ret = indycam_write_reg(client, INDYCAM_REG_GAMMA,
ctrl->value);
@@ -279,44 +282,50 @@ static int indycam_set_control(struct i2c_client *client,
/* I2C-interface */
static int indycam_attach(struct i2c_adapter *adap, int addr, int kind)
static int indycam_command(struct i2c_client *client, unsigned int cmd,
void *arg)
{
/* The old video_decoder interface just isn't enough,
* so we'll use some custom commands. */
switch (cmd) {
case VIDIOC_G_CTRL:
return indycam_get_control(client, arg);
case VIDIOC_S_CTRL:
return indycam_set_control(client, arg);
default:
return -EINVAL;
}
return 0;
}
static int indycam_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
int err = 0;
struct indycam *camera;
struct i2c_client *client;
printk(KERN_INFO "SGI IndyCam driver version %s\n",
INDYCAM_MODULE_VERSION);
v4l_info(client, "chip found @ 0x%x (%s)\n",
client->addr << 1, client->adapter->name);
client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
if (!client)
return -ENOMEM;
camera = kzalloc(sizeof(struct indycam), GFP_KERNEL);
if (!camera) {
err = -ENOMEM;
goto out_free_client;
}
if (!camera)
return -ENOMEM;
client->addr = addr;
client->adapter = adap;
client->driver = &i2c_driver_indycam;
client->flags = 0;
strcpy(client->name, "IndyCam client");
i2c_set_clientdata(client, camera);
camera->client = client;
err = i2c_attach_client(client);
if (err)
goto out_free_camera;
camera->version = i2c_smbus_read_byte_data(client,
INDYCAM_REG_VERSION);
if (camera->version != CAMERA_VERSION_INDY &&
camera->version != CAMERA_VERSION_MOOSE) {
err = -ENODEV;
goto out_detach_client;
kfree(camera);
return -ENODEV;
}
printk(KERN_INFO "IndyCam v%d.%d detected\n",
INDYCAM_VERSION_MAJOR(camera->version),
INDYCAM_VERSION_MINOR(camera->version));
@@ -327,8 +336,8 @@ static int indycam_attach(struct i2c_adapter *adap, int addr, int kind)
err = indycam_write_block(client, 0, sizeof(initseq), (u8 *)&initseq);
if (err) {
printk(KERN_ERR "IndyCam initialization failed\n");
err = -EIO;
goto out_detach_client;
kfree(camera);
return -EIO;
}
indycam_regdump(client);
@@ -338,8 +347,8 @@ static int indycam_attach(struct i2c_adapter *adap, int addr, int kind)
INDYCAM_CONTROL_AGCENA | INDYCAM_CONTROL_AWBCTL);
if (err) {
printk(KERN_ERR "IndyCam: White balancing camera failed\n");
err = -EIO;
goto out_detach_client;
kfree(camera);
return -EIO;
}
indycam_regdump(client);
@@ -347,124 +356,33 @@ static int indycam_attach(struct i2c_adapter *adap, int addr, int kind)
printk(KERN_INFO "IndyCam initialized\n");
return 0;
out_detach_client:
i2c_detach_client(client);
out_free_camera:
kfree(camera);
out_free_client:
kfree(client);
return err;
}
static int indycam_probe(struct i2c_adapter *adap)
{
/* Indy specific crap */
if (adap->id == I2C_HW_SGI_VINO)
return indycam_attach(adap, INDYCAM_ADDR, 0);
/* Feel free to add probe here :-) */
return -ENODEV;
}
static int indycam_detach(struct i2c_client *client)
static int indycam_remove(struct i2c_client *client)
{
struct indycam *camera = i2c_get_clientdata(client);
i2c_detach_client(client);
kfree(camera);
kfree(client);
return 0;
}
static int indycam_command(struct i2c_client *client, unsigned int cmd,
void *arg)
static int indycam_legacy_probe(struct i2c_adapter *adapter)
{
// struct indycam *camera = i2c_get_clientdata(client);
/* The old video_decoder interface just isn't enough,
* so we'll use some custom commands. */
switch (cmd) {
case DECODER_GET_CAPABILITIES: {
struct video_decoder_capability *cap = arg;
cap->flags = VIDEO_DECODER_NTSC;
cap->inputs = 1;
cap->outputs = 1;
break;
}
case DECODER_GET_STATUS: {
int *iarg = arg;
*iarg = DECODER_STATUS_GOOD | DECODER_STATUS_NTSC |
DECODER_STATUS_COLOR;
break;
}
case DECODER_SET_NORM: {
int *iarg = arg;
switch (*iarg) {
case VIDEO_MODE_NTSC:
break;
default:
return -EINVAL;
}
break;
}
case DECODER_SET_INPUT: {
int *iarg = arg;
if (*iarg != 0)
return -EINVAL;
break;
}
case DECODER_SET_OUTPUT: {
int *iarg = arg;
if (*iarg != 0)
return -EINVAL;
break;
}
case DECODER_ENABLE_OUTPUT: {
/* Always enabled */
break;
}
case DECODER_SET_PICTURE: {
// struct video_picture *pic = arg;
/* TODO: convert values for indycam_set_controls() */
break;
}
case DECODER_INDYCAM_GET_CONTROL: {
return indycam_get_control(client, arg);
}
case DECODER_INDYCAM_SET_CONTROL: {
return indycam_set_control(client, arg);
}
default:
return -EINVAL;
}
return 0;
return adapter->id == I2C_HW_SGI_VINO;
}
static struct i2c_driver i2c_driver_indycam = {
.driver = {
.name = "indycam",
},
.id = I2C_DRIVERID_INDYCAM,
.attach_adapter = indycam_probe,
.detach_client = indycam_detach,
.command = indycam_command,
static const struct i2c_device_id indycam_id[] = {
{ "indycam", 0 },
{ }
};
MODULE_DEVICE_TABLE(i2c, indycam_id);
static int __init indycam_init(void)
{
return i2c_add_driver(&i2c_driver_indycam);
}
static void __exit indycam_exit(void)
{
i2c_del_driver(&i2c_driver_indycam);
}
module_init(indycam_init);
module_exit(indycam_exit);
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
.name = "indycam",
.driverid = I2C_DRIVERID_INDYCAM,
.command = indycam_command,
.probe = indycam_probe,
.remove = indycam_remove,
.legacy_probe = indycam_legacy_probe,
.id_table = indycam_id,
};

19
drivers/media/video/indycam.h
View File

@@ -87,22 +87,7 @@
/* Driver interface definitions */
#define INDYCAM_CONTROL_AGC 0 /* boolean */
#define INDYCAM_CONTROL_AWB 1 /* boolean */
#define INDYCAM_CONTROL_SHUTTER 2
#define INDYCAM_CONTROL_GAIN 3
#define INDYCAM_CONTROL_RED_BALANCE 4
#define INDYCAM_CONTROL_BLUE_BALANCE 5
#define INDYCAM_CONTROL_RED_SATURATION 6
#define INDYCAM_CONTROL_BLUE_SATURATION 7
#define INDYCAM_CONTROL_GAMMA 8
struct indycam_control {
u8 type;
s32 value;
};
#define DECODER_INDYCAM_GET_CONTROL _IOR('d', 193, struct indycam_control)
#define DECODER_INDYCAM_SET_CONTROL _IOW('d', 194, struct indycam_control)
#define INDYCAM_CONTROL_RED_SATURATION (V4L2_CID_PRIVATE_BASE + 0)
#define INDYCAM_CONTROL_BLUE_SATURATION (V4L2_CID_PRIVATE_BASE + 1)
#endif

230
drivers/media/video/saa7191.c
View File

@@ -19,8 +19,7 @@
#include <linux/mm.h>
#include <linux/slab.h>
#include <linux/videodev.h>
#include <linux/video_decoder.h>
#include <linux/videodev2.h>
#include <linux/i2c.h>
#include <media/v4l2-common.h>
#include <media/v4l2-i2c-drv-legacy.h>
@@ -57,7 +56,7 @@ struct saa7191 {
u8 reg[25];
int input;
int norm;
v4l2_std_id norm;
};
static const u8 initseq[] = {
@@ -191,7 +190,7 @@ static int saa7191_set_input(struct i2c_client *client, int input)
return 0;
}
static int saa7191_set_norm(struct i2c_client *client, int norm)
static int saa7191_set_norm(struct i2c_client *client, v4l2_std_id norm)
{
struct saa7191 *decoder = i2c_get_clientdata(client);
u8 stdc = saa7191_read_reg(client, SAA7191_REG_STDC);
@@ -199,24 +198,20 @@ static int saa7191_set_norm(struct i2c_client *client, int norm)
u8 chcv = saa7191_read_reg(client, SAA7191_REG_CHCV);
int err;
switch(norm) {
case SAA7191_NORM_PAL:
if (norm & V4L2_STD_PAL) {
stdc &= ~SAA7191_STDC_SECS;
ctl3 &= ~(SAA7191_CTL3_AUFD | SAA7191_CTL3_FSEL);
chcv = SAA7191_CHCV_PAL;
break;
case SAA7191_NORM_NTSC:
} else if (norm & V4L2_STD_NTSC) {
stdc &= ~SAA7191_STDC_SECS;
ctl3 &= ~SAA7191_CTL3_AUFD;
ctl3 |= SAA7191_CTL3_FSEL;
chcv = SAA7191_CHCV_NTSC;
break;
case SAA7191_NORM_SECAM:
} else if (norm & V4L2_STD_SECAM) {
stdc |= SAA7191_STDC_SECS;
ctl3 &= ~(SAA7191_CTL3_AUFD | SAA7191_CTL3_FSEL);
chcv = SAA7191_CHCV_PAL;
break;
default:
} else {
return -EINVAL;
}
@@ -234,7 +229,7 @@ static int saa7191_set_norm(struct i2c_client *client, int norm)
dprintk("ctl3: %02x stdc: %02x chcv: %02x\n", ctl3,
stdc, chcv);
dprintk("norm: %d\n", norm);
dprintk("norm: %llx\n", norm);
return 0;
}
@@ -262,15 +257,19 @@ static int saa7191_wait_for_signal(struct i2c_client *client, u8 *status)
return -EBUSY;
}
static int saa7191_autodetect_norm_extended(struct i2c_client *client)
static int saa7191_autodetect_norm_extended(struct i2c_client *client,
v4l2_std_id *norm)
{
struct saa7191 *decoder = i2c_get_clientdata(client);
u8 stdc = saa7191_read_reg(client, SAA7191_REG_STDC);
u8 ctl3 = saa7191_read_reg(client, SAA7191_REG_CTL3);
u8 status;
v4l2_std_id old_norm = decoder->norm;
int err = 0;
dprintk("SAA7191 extended signal auto-detection...\n");
*norm = V4L2_STD_NTSC | V4L2_STD_PAL | V4L2_STD_SECAM;
stdc &= ~SAA7191_STDC_SECS;
ctl3 &= ~(SAA7191_CTL3_FSEL);
@@ -301,14 +300,15 @@ static int saa7191_autodetect_norm_extended(struct i2c_client *client)
if (status & SAA7191_STATUS_FIDT) {
/* 60Hz signal -> NTSC */
dprintk("60Hz signal: NTSC\n");
return saa7191_set_norm(client, SAA7191_NORM_NTSC);
*norm = V4L2_STD_NTSC;
return 0;
}
/* 50Hz signal */
dprintk("50Hz signal: Trying PAL...\n");
/* try PAL first */
err = saa7191_set_norm(client, SAA7191_NORM_PAL);
err = saa7191_set_norm(client, V4L2_STD_PAL);
if (err)
goto out;
@@ -321,20 +321,20 @@ static int saa7191_autodetect_norm_extended(struct i2c_client *client)
/* not 50Hz ? */
if (status & SAA7191_STATUS_FIDT) {
dprintk("No 50Hz signal\n");
err = -EAGAIN;
goto out;
saa7191_set_norm(client, old_norm);
return -EAGAIN;
}
if (status & SAA7191_STATUS_CODE) {
dprintk("PAL\n");
return 0;
*norm = V4L2_STD_PAL;
return saa7191_set_norm(client, old_norm);
}
dprintk("No color detected with PAL - Trying SECAM...\n");
/* no color detected ? -> try SECAM */
err = saa7191_set_norm(client,
SAA7191_NORM_SECAM);
err = saa7191_set_norm(client, V4L2_STD_SECAM);
if (err)
goto out;
@@ -354,29 +354,14 @@ static int saa7191_autodetect_norm_extended(struct i2c_client *client)
if (status & SAA7191_STATUS_CODE) {
/* Color detected -> SECAM */
dprintk("SECAM\n");
return 0;
*norm = V4L2_STD_SECAM;
return saa7191_set_norm(client, old_norm);
}
dprintk("No color detected with SECAM - Going back to PAL.\n");
/* still no color detected ?
* -> set norm back to PAL */
err = saa7191_set_norm(client,
SAA7191_NORM_PAL);
if (err)
goto out;
out:
ctl3 = saa7191_read_reg(client, SAA7191_REG_CTL3);
if (ctl3 & SAA7191_CTL3_AUFD) {
ctl3 &= ~(SAA7191_CTL3_AUFD);
err = saa7191_write_reg(client, SAA7191_REG_CTL3, ctl3);
if (err) {
err = -EIO;
}
}
return err;
return saa7191_set_norm(client, old_norm);
}
static int saa7191_autodetect_norm(struct i2c_client *client)
@@ -403,26 +388,26 @@ static int saa7191_autodetect_norm(struct i2c_client *client)
if (status & SAA7191_STATUS_FIDT) {
/* 60hz signal -> NTSC */
dprintk("NTSC\n");
return saa7191_set_norm(client, SAA7191_NORM_NTSC);
return saa7191_set_norm(client, V4L2_STD_NTSC);
} else {
/* 50hz signal -> PAL */
dprintk("PAL\n");
return saa7191_set_norm(client, SAA7191_NORM_PAL);
return saa7191_set_norm(client, V4L2_STD_PAL);
}
}
static int saa7191_get_control(struct i2c_client *client,
struct saa7191_control *ctrl)
struct v4l2_control *ctrl)
{
u8 reg;
int ret = 0;
switch (ctrl->type) {
switch (ctrl->id) {
case SAA7191_CONTROL_BANDPASS:
case SAA7191_CONTROL_BANDPASS_WEIGHT:
case SAA7191_CONTROL_CORING:
reg = saa7191_read_reg(client, SAA7191_REG_LUMA);
switch (ctrl->type) {
switch (ctrl->id) {
case SAA7191_CONTROL_BANDPASS:
ctrl->value = ((s32)reg & SAA7191_LUMA_BPSS_MASK)
>> SAA7191_LUMA_BPSS_SHIFT;
@@ -440,13 +425,13 @@ static int saa7191_get_control(struct i2c_client *client,
case SAA7191_CONTROL_FORCE_COLOUR:
case SAA7191_CONTROL_CHROMA_GAIN:
reg = saa7191_read_reg(client, SAA7191_REG_GAIN);
if (ctrl->type == SAA7191_CONTROL_FORCE_COLOUR)
if (ctrl->id == SAA7191_CONTROL_FORCE_COLOUR)
ctrl->value = ((s32)reg & SAA7191_GAIN_COLO) ? 1 : 0;
else
ctrl->value = ((s32)reg & SAA7191_GAIN_LFIS_MASK)
>> SAA7191_GAIN_LFIS_SHIFT;
break;
case SAA7191_CONTROL_HUE:
case V4L2_CID_HUE:
reg = saa7191_read_reg(client, SAA7191_REG_HUEC);
if (reg < 0x80)
reg += 0x80;
@@ -478,17 +463,17 @@ static int saa7191_get_control(struct i2c_client *client,
}
static int saa7191_set_control(struct i2c_client *client,
struct saa7191_control *ctrl)
struct v4l2_control *ctrl)
{
u8 reg;
int ret = 0;
switch (ctrl->type) {
switch (ctrl->id) {
case SAA7191_CONTROL_BANDPASS:
case SAA7191_CONTROL_BANDPASS_WEIGHT:
case SAA7191_CONTROL_CORING:
reg = saa7191_read_reg(client, SAA7191_REG_LUMA);
switch (ctrl->type) {
switch (ctrl->id) {
case SAA7191_CONTROL_BANDPASS:
reg &= ~SAA7191_LUMA_BPSS_MASK;
reg |= (ctrl->value << SAA7191_LUMA_BPSS_SHIFT)
@@ -510,7 +495,7 @@ static int saa7191_set_control(struct i2c_client *client,
case SAA7191_CONTROL_FORCE_COLOUR:
case SAA7191_CONTROL_CHROMA_GAIN:
reg = saa7191_read_reg(client, SAA7191_REG_GAIN);
if (ctrl->type == SAA7191_CONTROL_FORCE_COLOUR) {
if (ctrl->id == SAA7191_CONTROL_FORCE_COLOUR) {
if (ctrl->value)
reg |= SAA7191_GAIN_COLO;
else
@@ -522,7 +507,7 @@ static int saa7191_set_control(struct i2c_client *client,
}
ret = saa7191_write_reg(client, SAA7191_REG_GAIN, reg);
break;
case SAA7191_CONTROL_HUE:
case V4L2_CID_HUE:
reg = ctrl->value & 0xff;
if (reg < 0x80)
reg += 0x80;
@@ -568,141 +553,42 @@ static int saa7191_set_control(struct i2c_client *client,
static int saa7191_command(struct i2c_client *client, unsigned int cmd,
void *arg)
{
struct saa7191 *decoder = i2c_get_clientdata(client);
switch (cmd) {
case DECODER_GET_CAPABILITIES: {
struct video_decoder_capability *cap = arg;
cap->flags = VIDEO_DECODER_PAL | VIDEO_DECODER_NTSC |
VIDEO_DECODER_SECAM | VIDEO_DECODER_AUTO;
cap->inputs = (client->adapter->id == I2C_HW_SGI_VINO) ? 2 : 1;
cap->outputs = 1;
break;
}
case DECODER_GET_STATUS: {
int *iarg = arg;
case VIDIOC_INT_G_INPUT_STATUS: {
u32 *iarg = arg;
u8 status;
int res = 0;
int res = V4L2_IN_ST_NO_SIGNAL;
if (saa7191_read_status(client, &status)) {
if (saa7191_read_status(client, &status))
return -EIO;
}
if ((status & SAA7191_STATUS_HLCK) == 0)
res |= DECODER_STATUS_GOOD;
if (status & SAA7191_STATUS_CODE)
res |= DECODER_STATUS_COLOR;
switch (decoder->norm) {
case SAA7191_NORM_NTSC:
res |= DECODER_STATUS_NTSC;
break;
case SAA7191_NORM_PAL:
res |= DECODER_STATUS_PAL;
break;
case SAA7191_NORM_SECAM:
res |= DECODER_STATUS_SECAM;
break;
case SAA7191_NORM_AUTO:
default:
if (status & SAA7191_STATUS_FIDT)
res |= DECODER_STATUS_NTSC;
else
res |= DECODER_STATUS_PAL;
break;
}
res = 0;
if (!(status & SAA7191_STATUS_CODE))
res |= V4L2_IN_ST_NO_COLOR;
*iarg = res;
break;
}
case DECODER_SET_NORM: {
int *iarg = arg;
switch (*iarg) {
case VIDEO_MODE_AUTO:
return saa7191_autodetect_norm(client);
case VIDEO_MODE_PAL:
return saa7191_set_norm(client, SAA7191_NORM_PAL);
case VIDEO_MODE_NTSC:
return saa7191_set_norm(client, SAA7191_NORM_NTSC);
case VIDEO_MODE_SECAM:
return saa7191_set_norm(client, SAA7191_NORM_SECAM);
default:
return -EINVAL;
}
break;
case VIDIOC_QUERYSTD:
return saa7191_autodetect_norm_extended(client, arg);
case VIDIOC_S_STD: {
v4l2_std_id *istd = arg;
return saa7191_set_norm(client, *istd);
}
case DECODER_SET_INPUT: {
int *iarg = arg;
case VIDIOC_INT_S_VIDEO_ROUTING: {
struct v4l2_routing *route = arg;
switch (client->adapter->id) {
case I2C_HW_SGI_VINO:
return saa7191_set_input(client, *iarg);
default:
if (*iarg != 0)
return -EINVAL;
}
break;
return saa7191_set_input(client, route->input);
}
case DECODER_SET_OUTPUT: {
int *iarg = arg;
/* not much choice of outputs */
if (*iarg != 0)
return -EINVAL;
break;
}
case DECODER_ENABLE_OUTPUT: {
/* Always enabled */
break;
}
case DECODER_SET_PICTURE: {
struct video_picture *pic = arg;
unsigned val;
int err;
val = (pic->hue >> 8) - 0x80;
err = saa7191_write_reg(client, SAA7191_REG_HUEC, val);
if (err)
return -EIO;
break;
}
case DECODER_SAA7191_GET_STATUS: {
struct saa7191_status *status = arg;
u8 status_reg;
if (saa7191_read_status(client, &status_reg))
return -EIO;
status->signal = ((status_reg & SAA7191_STATUS_HLCK) == 0)
? 1 : 0;
status->signal_60hz = (status_reg & SAA7191_STATUS_FIDT)
? 1 : 0;
status->color = (status_reg & SAA7191_STATUS_CODE) ? 1 : 0;
status->input = decoder->input;
status->norm = decoder->norm;
break;
}
case DECODER_SAA7191_SET_NORM: {
int *norm = arg;
switch (*norm) {
case SAA7191_NORM_AUTO:
return saa7191_autodetect_norm(client);
case SAA7191_NORM_AUTO_EXT:
return saa7191_autodetect_norm_extended(client);
default:
return saa7191_set_norm(client, *norm);
}
}
case DECODER_SAA7191_GET_CONTROL: {
case VIDIOC_G_CTRL:
return saa7191_get_control(client, arg);
}
case DECODER_SAA7191_SET_CONTROL: {
case VIDIOC_S_CTRL:
return saa7191_set_control(client, arg);
}
default:
return -EINVAL;
}
@@ -737,7 +623,7 @@ static int saa7191_probe(struct i2c_client *client,
printk(KERN_INFO "SAA7191 initialized\n");
decoder->input = SAA7191_INPUT_COMPOSITE;
decoder->norm = SAA7191_NORM_PAL;
decoder->norm = V4L2_STD_PAL;
err = saa7191_autodetect_norm(client);
if (err && (err != -EBUSY))

26
drivers/media/video/saa7191.h
View File

@@ -176,11 +176,9 @@
#define SAA7191_INPUT_COMPOSITE 0
#define SAA7191_INPUT_SVIDEO 1
#define SAA7191_NORM_AUTO 0
#define SAA7191_NORM_PAL 1
#define SAA7191_NORM_NTSC 2
#define SAA7191_NORM_SECAM 3
#define SAA7191_NORM_AUTO_EXT 4 /* extended auto-detection */
struct saa7191_status {
/* 0=no signal, 1=signal detected */
@@ -232,24 +230,16 @@ struct saa7191_status {
#define SAA7191_VNR_MAX 0x03
#define SAA7191_VNR_DEFAULT 0x00
#define SAA7191_CONTROL_BANDPASS 0
#define SAA7191_CONTROL_BANDPASS_WEIGHT 1
#define SAA7191_CONTROL_CORING 2
#define SAA7191_CONTROL_FORCE_COLOUR 3 /* boolean */
#define SAA7191_CONTROL_CHROMA_GAIN 4
#define SAA7191_CONTROL_HUE 5
#define SAA7191_CONTROL_VTRC 6 /* boolean */
#define SAA7191_CONTROL_LUMA_DELAY 7
#define SAA7191_CONTROL_VNR 8
struct saa7191_control {
u8 type;
s32 value;
};
#define SAA7191_CONTROL_BANDPASS (V4L2_CID_PRIVATE_BASE + 0)
#define SAA7191_CONTROL_BANDPASS_WEIGHT (V4L2_CID_PRIVATE_BASE + 1)
#define SAA7191_CONTROL_CORING (V4L2_CID_PRIVATE_BASE + 2)
#define SAA7191_CONTROL_FORCE_COLOUR (V4L2_CID_PRIVATE_BASE + 3)
#define SAA7191_CONTROL_CHROMA_GAIN (V4L2_CID_PRIVATE_BASE + 4)
#define SAA7191_CONTROL_VTRC (V4L2_CID_PRIVATE_BASE + 5)
#define SAA7191_CONTROL_LUMA_DELAY (V4L2_CID_PRIVATE_BASE + 6)
#define SAA7191_CONTROL_VNR (V4L2_CID_PRIVATE_BASE + 7)
#define DECODER_SAA7191_GET_STATUS _IOR('d', 195, struct saa7191_status)
#define DECODER_SAA7191_SET_NORM _IOW('d', 196, int)
#define DECODER_SAA7191_GET_CONTROL _IOR('d', 197, struct saa7191_control)
#define DECODER_SAA7191_SET_CONTROL _IOW('d', 198, struct saa7191_control)
#endif

396
drivers/media/video/vino.c
View File

File diff suppressed because it is too large Load Diff