diff options
| author | Nickolay V. Shmyrev <devnull@localhost> | 2005-06-17 20:49:30 +0000 |
|---|---|---|
| committer | Nickolay V. Shmyrev <devnull@localhost> | 2005-06-17 20:49:30 +0000 |
| commit | a085c62e8b7277e8802f295059ad35a8fcb73e2e (patch) | |
| tree | c1432e4d7a642e299de8690171121fa7a55fcfdc /linux/drivers/media/video/cx88 | |
| parent | 1a8395bd7f1fd3496f8812dd01d75feb3fe2cd0b (diff) | |
| download | mediapointer-dvb-s2-a085c62e8b7277e8802f295059ad35a8fcb73e2e.tar.gz mediapointer-dvb-s2-a085c62e8b7277e8802f295059ad35a8fcb73e2e.tar.bz2 | |
* Make.config, Makefile, cx88-core.c, cx88-video.c:
* cx88.h, msp3400.c, saa6752hs.c:
* tda9887.c, tuner-core.c, tvaudio.c, tveeprom.c:
- Remove unneeded config options. Now I2C_CLIENT_MULTI
and I2C_NORMAL_RANGE is checked on the fly.
Diffstat (limited to 'linux/drivers/media/video/cx88')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-core.c | 16 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 15 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 4 |
3 files changed, 3 insertions, 32 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-core.c b/linux/drivers/media/video/cx88/cx88-core.c index 342233e09..b82abf2b3 100644 --- a/linux/drivers/media/video/cx88/cx88-core.c +++ b/linux/drivers/media/video/cx88/cx88-core.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-core.c,v 1.29 2005/06/13 08:42:51 nsh Exp $ + * $Id: cx88-core.c,v 1.30 2005/06/17 20:49:30 nsh Exp $ * * device driver for Conexant 2388x based TV cards * driver core @@ -1013,21 +1013,7 @@ int cx88_set_tvnorm(struct cx88_core *core, struct cx88_tvnorm *norm) set_tvaudio(core); // tell i2c chips -#ifdef V4L2_I2C_CLIENTS cx88_call_i2c_clients(core,VIDIOC_S_STD,&norm->id); -#else - { - struct video_channel c; - memset(&c,0,sizeof(c)); - c.channel = core->input; - c.norm = VIDEO_MODE_PAL; - if ((norm->id & (V4L2_STD_NTSC_M|V4L2_STD_NTSC_M_JP))) - c.norm = VIDEO_MODE_NTSC; - if (norm->id & V4L2_STD_SECAM) - c.norm = VIDEO_MODE_SECAM; - cx88_call_i2c_clients(core,VIDIOCSCHAN,&c); - } -#endif // done return 0; diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index 3ceb8cb96..7edb24afa 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-video.c,v 1.66 2005/06/17 03:36:10 mchehab Exp $ + * $Id: cx88-video.c,v 1.67 2005/06/17 20:49:30 nsh Exp $ * * device driver for Conexant 2388x based TV cards * video4linux video interface @@ -1616,11 +1616,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file, down(&dev->lock); dev->freq = f->frequency; cx88_newstation(core); -#ifdef V4L2_I2C_CLIENTS cx88_call_i2c_clients(dev->core,VIDIOC_S_FREQUENCY,f); -#else - cx88_call_i2c_clients(dev->core,VIDIOCSFREQ,&dev->freq); -#endif up(&dev->lock); return 0; } @@ -1731,16 +1727,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file, memset(t,0,sizeof(*t)); strcpy(t->name, "Radio"); -#ifdef V4L2_I2C_CLIENTS cx88_call_i2c_clients(dev->core,VIDIOC_G_TUNER,t); -#else - { - struct video_tuner vt; - memset(&vt,0,sizeof(vt)); - cx88_call_i2c_clients(dev,VIDIOCGTUNER,&vt); - t->signal = vt.signal; - } -#endif return 0; } case VIDIOC_ENUMINPUT: diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index e885fc772..7fb2f89e9 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -1,5 +1,5 @@ /* - * $Id: cx88.h,v 1.63 2005/06/12 23:32:13 nsh Exp $ + * $Id: cx88.h,v 1.64 2005/06/17 20:49:30 nsh Exp $ * * v4l2 device driver for cx2388x based TV cards * @@ -52,8 +52,6 @@ /* ----------------------------------------------------------- */ /* defines and enums */ -#define V4L2_I2C_CLIENTS 1 - #define FORMAT_FLAGS_PACKED 0x01 #define FORMAT_FLAGS_PLANAR 0x02 |