diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-27 11:51:24 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-27 11:51:24 -0300 |
| commit | e23e03dc509f8644678aa10be2b84259fb0b29ab (patch) | |
| tree | 8e53d47250fa58232430b20ffbdb9e570a31d188 /linux/include/sound | |
| parent | 5339f680e0ed5c049b9e1f3251365474162c1788 (diff) | |
| download | mediapointer-dvb-s2-e23e03dc509f8644678aa10be2b84259fb0b29ab.tar.gz mediapointer-dvb-s2-e23e03dc509f8644678aa10be2b84259fb0b29ab.tar.bz2 | |
tea575x-tuner: convert it to V4L2 API
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include/sound')
| -rw-r--r-- | linux/include/sound/tea575x-tuner.h | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/linux/include/sound/tea575x-tuner.h b/linux/include/sound/tea575x-tuner.h index b09cf5882..4c6443a7a 100644 --- a/linux/include/sound/tea575x-tuner.h +++ b/linux/include/sound/tea575x-tuner.h @@ -23,24 +23,16 @@ */ #include "compat.h" -#include <linux/videodev.h> +#include <linux/videodev2.h> #include <media/v4l2-dev.h> +#include <media/v4l2-ioctl.h> -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17) -typedef struct snd_tea575x tea575x_t; -#else struct snd_tea575x; -#endif struct snd_tea575x_ops { -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17) - void (*write)(tea575x_t *tea, unsigned int val); - unsigned int (*read)(tea575x_t *tea); -#else void (*write)(struct snd_tea575x *tea, unsigned int val); unsigned int (*read)(struct snd_tea575x *tea); void (*mute)(struct snd_tea575x *tea, unsigned int mute); -#endif }; struct snd_tea575x { @@ -49,11 +41,10 @@ struct snd_tea575x { #else struct snd_card *card; #endif - struct video_device vd; /* video device */ - struct v4l2_file_operations fops; + struct video_device *vd; /* video device */ int dev_nr; /* requested device number + 1 */ - int vd_registered; /* video device is registered */ int tea5759; /* 5759 chip is present */ + int mute; /* Device is muted? */ unsigned int freq_fixup; /* crystal onboard */ unsigned int val; /* hw value */ unsigned long freq; /* frequency */ @@ -62,12 +53,7 @@ struct snd_tea575x { void *private_data; }; -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,17) -void snd_tea575x_init(tea575x_t *tea); -void snd_tea575x_exit(tea575x_t *tea); -#else void snd_tea575x_init(struct snd_tea575x *tea); void snd_tea575x_exit(struct snd_tea575x *tea); -#endif #endif /* __SOUND_TEA575X_TUNER_H */ |