diff options
| author | Gerd Knorr <devnull@localhost> | 2004-09-17 11:49:52 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2004-09-17 11:49:52 +0000 |
| commit | c420e9159155c873803d8fe434b3c02aa17e1072 (patch) | |
| tree | f7823bd928479c6504eb05873294c19186c23565 /linux/drivers/media | |
| parent | c40a86c67942fe83a8a3461a5ae7702f7471474e (diff) | |
| download | mediapointer-dvb-s2-c420e9159155c873803d8fe434b3c02aa17e1072.tar.gz mediapointer-dvb-s2-c420e9159155c873803d8fe434b3c02aa17e1072.tar.bz2 | |
- cx88: maybe fix nicam + pal-i
- v4l2: mpeg api first cut
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-tvaudio.c | 5 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88.h | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-tvaudio.c b/linux/drivers/media/video/cx88/cx88-tvaudio.c index b7b3f3ca4..3329e8cbe 100644 --- a/linux/drivers/media/video/cx88/cx88-tvaudio.c +++ b/linux/drivers/media/video/cx88/cx88-tvaudio.c @@ -1,5 +1,5 @@ /* - $Id: cx88-tvaudio.c,v 1.19 2004/09/15 16:15:24 kraxel Exp $ + $Id: cx88-tvaudio.c,v 1.20 2004/09/17 11:49:52 kraxel Exp $ cx88x-audio.c - Conexant CX23880/23881 audio downstream driver driver @@ -327,8 +327,9 @@ static void set_audio_standard_NICAM(struct cx88_core *core) case WW_NICAM_I: dprintk("%s PAL-I NICAM (status: unknown)\n",__FUNCTION__); set_audio_registers(core, nicam_pal_i); + break; case WW_NICAM_BGDKL: - dprintk("%s PAL NICAM (status: unknown)\n",__FUNCTION__); + dprintk("%s PAL-BGDK NICAM (status: unknown)\n",__FUNCTION__); set_audio_registers(core, nicam_default); break; }; diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index 207e0deb8..8df208c55 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.32 2004/09/07 14:30:54 kraxel Exp $ + * $Id: cx88.h,v 1.33 2004/09/17 11:49:52 kraxel Exp $ * * v4l2 device driver for cx2388x based TV cards * @@ -60,6 +60,12 @@ #define CX88_MAXBOARDS 8 +/* temporary here until new dvb-kernel code is merged ... */ +#ifndef FE_REGISTER +# define FE_REGISTER _IO ('v', 84) +# define FE_UNREGISTER _IO ('v', 85) +#endif + /* ----------------------------------------------------------- */ /* defines and enums */ |