V4L/DVB (8944): saa5249: convert i2c driver for new i2c API
- Convert to use v4l2-i2c-drv-legacy.h to be able to handle the new i2c API - Cleanups - Use v4l_dbg/v4l_info to have uniform kernel messages Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Hans Verkuil
Mauro Carvalho Chehab
parent
71ef85c7e0
commit
96af9880c0
1 changed files with 288 additions and 363 deletions
|
|
@ -15,8 +15,6 @@
|
|||
*
|
||||
* Copyright (c) 1998 Richard Guenther <richard.guenther@student.uni-tuebingen.de>
|
||||
*
|
||||
* $Id: saa5249.c,v 1.1 1998/03/30 22:23:23 alan Exp $
|
||||
*
|
||||
* Derived From
|
||||
*
|
||||
* vtx.c:
|
||||
|
|
@ -45,34 +43,27 @@
|
|||
|
||||
#include <linux/module.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/errno.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/ioport.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/smp_lock.h>
|
||||
#include <stdarg.h>
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/smp_lock.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/videotext.h>
|
||||
#include <linux/videodev.h>
|
||||
#include <media/v4l2-common.h>
|
||||
#include <media/v4l2-ioctl.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <media/v4l2-i2c-drv-legacy.h>
|
||||
|
||||
|
||||
#include <asm/io.h>
|
||||
#include <asm/uaccess.h>
|
||||
MODULE_AUTHOR("Michael Geng <linux@MichaelGeng.de>");
|
||||
MODULE_DESCRIPTION("Philips SAA5249 Teletext decoder driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
#define VTX_VER_MAJ 1
|
||||
#define VTX_VER_MIN 8
|
||||
|
||||
|
||||
|
||||
#define NUM_DAUS 4
|
||||
#define NUM_BUFS 8
|
||||
#define IF_NAME "SAA5249"
|
||||
|
||||
static const int disp_modes[8][3] =
|
||||
{
|
||||
|
|
@ -125,125 +116,8 @@ struct saa5249_device
|
|||
|
||||
#define VTX_DEV_MINOR 0
|
||||
|
||||
/* General defines and debugging support */
|
||||
|
||||
#define RESCHED do { cond_resched(); } while(0)
|
||||
|
||||
static struct video_device saa_template; /* Declared near bottom */
|
||||
|
||||
/* Addresses to scan */
|
||||
static unsigned short normal_i2c[] = {34>>1,I2C_CLIENT_END};
|
||||
|
||||
I2C_CLIENT_INSMOD;
|
||||
|
||||
static struct i2c_client client_template;
|
||||
|
||||
static int saa5249_attach(struct i2c_adapter *adap, int addr, int kind)
|
||||
{
|
||||
int pgbuf;
|
||||
int err;
|
||||
struct i2c_client *client;
|
||||
struct video_device *vd;
|
||||
struct saa5249_device *t;
|
||||
|
||||
printk(KERN_INFO "saa5249: teletext chip found.\n");
|
||||
client=kmalloc(sizeof(*client), GFP_KERNEL);
|
||||
if(client==NULL)
|
||||
return -ENOMEM;
|
||||
client_template.adapter = adap;
|
||||
client_template.addr = addr;
|
||||
memcpy(client, &client_template, sizeof(*client));
|
||||
t = kzalloc(sizeof(*t), GFP_KERNEL);
|
||||
if(t==NULL)
|
||||
{
|
||||
kfree(client);
|
||||
return -ENOMEM;
|
||||
}
|
||||
strlcpy(client->name, IF_NAME, I2C_NAME_SIZE);
|
||||
mutex_init(&t->lock);
|
||||
|
||||
/*
|
||||
* Now create a video4linux device
|
||||
*/
|
||||
|
||||
vd = kmalloc(sizeof(struct video_device), GFP_KERNEL);
|
||||
if(vd==NULL)
|
||||
{
|
||||
kfree(t);
|
||||
kfree(client);
|
||||
return -ENOMEM;
|
||||
}
|
||||
i2c_set_clientdata(client, vd);
|
||||
memcpy(vd, &saa_template, sizeof(*vd));
|
||||
|
||||
for (pgbuf = 0; pgbuf < NUM_DAUS; pgbuf++)
|
||||
{
|
||||
memset(t->vdau[pgbuf].pgbuf, ' ', sizeof(t->vdau[0].pgbuf));
|
||||
memset(t->vdau[pgbuf].sregs, 0, sizeof(t->vdau[0].sregs));
|
||||
memset(t->vdau[pgbuf].laststat, 0, sizeof(t->vdau[0].laststat));
|
||||
t->vdau[pgbuf].expire = 0;
|
||||
t->vdau[pgbuf].clrfound = true;
|
||||
t->vdau[pgbuf].stopped = true;
|
||||
t->is_searching[pgbuf] = false;
|
||||
}
|
||||
video_set_drvdata(vd, t);
|
||||
|
||||
|
||||
/*
|
||||
* Register it
|
||||
*/
|
||||
|
||||
if((err=video_register_device(vd, VFL_TYPE_VTX,-1))<0)
|
||||
{
|
||||
kfree(t);
|
||||
kfree(vd);
|
||||
kfree(client);
|
||||
return err;
|
||||
}
|
||||
t->client = client;
|
||||
i2c_attach_client(client);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* We do most of the hard work when we become a device on the i2c.
|
||||
*/
|
||||
|
||||
static int saa5249_probe(struct i2c_adapter *adap)
|
||||
{
|
||||
if (adap->class & I2C_CLASS_TV_ANALOG)
|
||||
return i2c_probe(adap, &addr_data, saa5249_attach);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int saa5249_detach(struct i2c_client *client)
|
||||
{
|
||||
struct video_device *vd = i2c_get_clientdata(client);
|
||||
i2c_detach_client(client);
|
||||
video_unregister_device(vd);
|
||||
kfree(video_get_drvdata(vd));
|
||||
kfree(vd);
|
||||
kfree(client);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* new I2C driver support */
|
||||
|
||||
static struct i2c_driver i2c_driver_videotext =
|
||||
{
|
||||
.driver = {
|
||||
.name = IF_NAME, /* name */
|
||||
},
|
||||
.id = I2C_DRIVERID_SAA5249, /* in i2c.h */
|
||||
.attach_adapter = saa5249_probe,
|
||||
.detach_client = saa5249_detach,
|
||||
};
|
||||
|
||||
static struct i2c_client client_template = {
|
||||
.driver = &i2c_driver_videotext,
|
||||
.name = "(unset)",
|
||||
};
|
||||
|
||||
/*
|
||||
* Wait the given number of jiffies (10ms). This calls the scheduler, so the actual
|
||||
* delay may be longer.
|
||||
|
|
@ -277,7 +151,7 @@ static int i2c_sendbuf(struct saa5249_device *t, int reg, int count, u8 *data)
|
|||
buf[0] = reg;
|
||||
memcpy(buf+1, data, count);
|
||||
|
||||
if(i2c_master_send(t->client, buf, count+1)==count+1)
|
||||
if (i2c_master_send(t->client, buf, count + 1) == count + 1)
|
||||
return 0;
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -321,8 +195,7 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
|
|||
static int virtual_mode = false;
|
||||
struct saa5249_device *t = video_drvdata(file);
|
||||
|
||||
switch(cmd)
|
||||
{
|
||||
switch (cmd) {
|
||||
case VTXIOCGETINFO:
|
||||
{
|
||||
vtx_info_t *info = arg;
|
||||
|
|
@ -391,8 +264,7 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
|
|||
|
||||
if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS)
|
||||
return -EINVAL;
|
||||
if (!t->vdau[req->pgbuf].stopped)
|
||||
{
|
||||
if (!t->vdau[req->pgbuf].stopped) {
|
||||
if (i2c_senddata(t, 2, 0, -1) ||
|
||||
i2c_sendbuf(t, 3, sizeof(t->vdau[0].sregs), t->vdau[req->pgbuf].sregs) ||
|
||||
i2c_senddata(t, 8, 0, 25, 0, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', -1) ||
|
||||
|
|
@ -412,8 +284,7 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
|
|||
return -EIO;
|
||||
t->vdau[req->pgbuf].expire = jiffies + PGBUF_EXPIRE;
|
||||
memset(t->vdau[req->pgbuf].pgbuf + VTX_PAGESIZE, ' ', VTX_VIRTUALSIZE - VTX_PAGESIZE);
|
||||
if (t->virtual_mode)
|
||||
{
|
||||
if (t->virtual_mode) {
|
||||
/* Packet X/24 */
|
||||
if (i2c_senddata(t, 8, 0, 0x20, 0, -1) ||
|
||||
i2c_getdata(t, 40, t->vdau[req->pgbuf].pgbuf + VTX_PAGESIZE + 20 * 40))
|
||||
|
|
@ -432,14 +303,10 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
|
|||
}
|
||||
t->vdau[req->pgbuf].clrfound = false;
|
||||
memcpy(t->vdau[req->pgbuf].laststat, infobits, sizeof(infobits));
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
memcpy(infobits, t->vdau[req->pgbuf].laststat, sizeof(infobits));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
memcpy(infobits, t->vdau[req->pgbuf].laststat, sizeof(infobits));
|
||||
}
|
||||
|
||||
|
|
@ -460,22 +327,18 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
|
|||
info.notfound = !!(infobits[8] & 0x10);
|
||||
info.pblf = !!(infobits[9] & 0x20);
|
||||
info.hamming = 0;
|
||||
for (a = 0; a <= 7; a++)
|
||||
{
|
||||
if (infobits[a] & 0xf0)
|
||||
{
|
||||
for (a = 0; a <= 7; a++) {
|
||||
if (infobits[a] & 0xf0) {
|
||||
info.hamming = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (t->vdau[req->pgbuf].clrfound)
|
||||
info.notfound = 1;
|
||||
if(copy_to_user(req->buffer, &info, sizeof(vtx_pageinfo_t)))
|
||||
if (copy_to_user(req->buffer, &info, sizeof(vtx_pageinfo_t)))
|
||||
return -EFAULT;
|
||||
if (!info.hamming && !info.notfound)
|
||||
{
|
||||
t->is_searching[req->pgbuf] = false;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -487,38 +350,37 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
|
|||
if (req->pgbuf < 0 || req->pgbuf >= NUM_DAUS || req->start < 0 ||
|
||||
req->start > req->end || req->end >= (virtual_mode ? VTX_VIRTUALSIZE : VTX_PAGESIZE))
|
||||
return -EINVAL;
|
||||
if(copy_to_user(req->buffer, &t->vdau[req->pgbuf].pgbuf[req->start], req->end - req->start + 1))
|
||||
if (copy_to_user(req->buffer, &t->vdau[req->pgbuf].pgbuf[req->start], req->end - req->start + 1))
|
||||
return -EFAULT;
|
||||
|
||||
/*
|
||||
* Always read the time directly from SAA5249
|
||||
*/
|
||||
|
||||
if (req->start <= 39 && req->end >= 32)
|
||||
{
|
||||
if (req->start <= 39 && req->end >= 32) {
|
||||
int len;
|
||||
char buf[16];
|
||||
start = max(req->start, 32);
|
||||
end = min(req->end, 39);
|
||||
len=end-start+1;
|
||||
len = end - start + 1;
|
||||
if (i2c_senddata(t, 8, 0, 0, start, -1) ||
|
||||
i2c_getdata(t, len, buf))
|
||||
return -EIO;
|
||||
if(copy_to_user(req->buffer+start-req->start, buf, len))
|
||||
if (copy_to_user(req->buffer + start - req->start, buf, len))
|
||||
return -EFAULT;
|
||||
}
|
||||
/* Insert the current header if DAU is still searching for a page */
|
||||
if (req->start <= 31 && req->end >= 7 && t->is_searching[req->pgbuf])
|
||||
{
|
||||
if (req->start <= 31 && req->end >= 7 && t->is_searching[req->pgbuf]) {
|
||||
char buf[32];
|
||||
int len;
|
||||
|
||||
start = max(req->start, 7);
|
||||
end = min(req->end, 31);
|
||||
len=end-start+1;
|
||||
len = end - start + 1;
|
||||
if (i2c_senddata(t, 8, 0, 0, start, -1) ||
|
||||
i2c_getdata(t, len, buf))
|
||||
return -EIO;
|
||||
if(copy_to_user(req->buffer+start-req->start, buf, len))
|
||||
if (copy_to_user(req->buffer + start - req->start, buf, len))
|
||||
return -EFAULT;
|
||||
}
|
||||
return 0;
|
||||
|
|
@ -543,8 +405,11 @@ static int do_saa5249_ioctl(struct inode *inode, struct file *file,
|
|||
case VTXIOCCLRCACHE:
|
||||
{
|
||||
if (i2c_senddata(t, 0, NUM_DAUS, 0, 8, -1) || i2c_senddata(t, 11,
|
||||
' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',
|
||||
' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ', -1))
|
||||
' ', ' ', ' ', ' ', ' ', ' ',
|
||||
' ', ' ', ' ', ' ', ' ', ' ',
|
||||
' ', ' ', ' ', ' ', ' ', ' ',
|
||||
' ', ' ', ' ', ' ', ' ', ' ',
|
||||
-1))
|
||||
return -EIO;
|
||||
if (i2c_senddata(t, 3, 0x20, -1))
|
||||
return -EIO;
|
||||
|
|
@ -674,21 +539,6 @@ static int saa5249_release(struct inode *inode, struct file *file)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int __init init_saa_5249 (void)
|
||||
{
|
||||
printk(KERN_INFO "SAA5249 driver (" IF_NAME " interface) for VideoText version %d.%d\n",
|
||||
VTX_VER_MAJ, VTX_VER_MIN);
|
||||
return i2c_add_driver(&i2c_driver_videotext);
|
||||
}
|
||||
|
||||
static void __exit cleanup_saa_5249 (void)
|
||||
{
|
||||
i2c_del_driver(&i2c_driver_videotext);
|
||||
}
|
||||
|
||||
module_init(init_saa_5249);
|
||||
module_exit(cleanup_saa_5249);
|
||||
|
||||
static const struct file_operations saa_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = saa5249_open,
|
||||
|
|
@ -702,9 +552,84 @@ static const struct file_operations saa_fops = {
|
|||
|
||||
static struct video_device saa_template =
|
||||
{
|
||||
.name = IF_NAME,
|
||||
.name = "saa5249",
|
||||
.fops = &saa_fops,
|
||||
.release = video_device_release,
|
||||
};
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
/* Addresses to scan */
|
||||
static unsigned short normal_i2c[] = { 0x22 >> 1, I2C_CLIENT_END };
|
||||
|
||||
I2C_CLIENT_INSMOD;
|
||||
|
||||
static int saa5249_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
{
|
||||
int pgbuf;
|
||||
int err;
|
||||
struct video_device *vd;
|
||||
struct saa5249_device *t;
|
||||
|
||||
v4l_info(client, "chip found @ 0x%x (%s)\n",
|
||||
client->addr << 1, client->adapter->name);
|
||||
v4l_info(client, "VideoText version %d.%d\n",
|
||||
VTX_VER_MAJ, VTX_VER_MIN);
|
||||
t = kzalloc(sizeof(*t), GFP_KERNEL);
|
||||
if (t == NULL)
|
||||
return -ENOMEM;
|
||||
mutex_init(&t->lock);
|
||||
|
||||
/* Now create a video4linux device */
|
||||
vd = kmalloc(sizeof(struct video_device), GFP_KERNEL);
|
||||
if (vd == NULL) {
|
||||
kfree(client);
|
||||
return -ENOMEM;
|
||||
}
|
||||
i2c_set_clientdata(client, vd);
|
||||
memcpy(vd, &saa_template, sizeof(*vd));
|
||||
|
||||
for (pgbuf = 0; pgbuf < NUM_DAUS; pgbuf++) {
|
||||
memset(t->vdau[pgbuf].pgbuf, ' ', sizeof(t->vdau[0].pgbuf));
|
||||
memset(t->vdau[pgbuf].sregs, 0, sizeof(t->vdau[0].sregs));
|
||||
memset(t->vdau[pgbuf].laststat, 0, sizeof(t->vdau[0].laststat));
|
||||
t->vdau[pgbuf].expire = 0;
|
||||
t->vdau[pgbuf].clrfound = true;
|
||||
t->vdau[pgbuf].stopped = true;
|
||||
t->is_searching[pgbuf] = false;
|
||||
}
|
||||
video_set_drvdata(vd, t);
|
||||
|
||||
/* Register it */
|
||||
err = video_register_device(vd, VFL_TYPE_VTX, -1);
|
||||
if (err < 0) {
|
||||
kfree(t);
|
||||
kfree(vd);
|
||||
return err;
|
||||
}
|
||||
t->client = client;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int saa5249_remove(struct i2c_client *client)
|
||||
{
|
||||
struct video_device *vd = i2c_get_clientdata(client);
|
||||
|
||||
video_unregister_device(vd);
|
||||
kfree(video_get_drvdata(vd));
|
||||
kfree(vd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct i2c_device_id saa5249_id[] = {
|
||||
{ "saa5249", 0 },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(i2c, saa5249_id);
|
||||
|
||||
static struct v4l2_i2c_driver_data v4l2_i2c_data = {
|
||||
.name = "saa5249",
|
||||
.driverid = I2C_DRIVERID_SAA5249,
|
||||
.probe = saa5249_probe,
|
||||
.remove = saa5249_remove,
|
||||
.id_table = saa5249_id,
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue