Merge branch 'nfs-for-2.6.40' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

[pandora-kernel.git] / include / sound / tea575x-tuner.h

diff --git a/include/sound/tea575x-tuner.h b/include/sound/tea575x-tuner.h
index 5aade56..d2ea112 100644 (file)
--- a/include/sound/tea575x-tuner.h
+++ b/include/sound/tea575x-tuner.h
@@ -26,30 +26,37 @@
 #include <media/v4l2-dev.h>
 #include <media/v4l2-ioctl.h>
 
+#define TEA575X_FMIF   10700
+
+#define TEA575X_DATA   (1 << 0)
+#define TEA575X_CLK    (1 << 1)
+#define TEA575X_WREN   (1 << 2)
+#define TEA575X_MOST   (1 << 3)
+
 struct snd_tea575x;
 
 struct snd_tea575x_ops {
-       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);
+       void (*set_pins)(struct snd_tea575x *tea, u8 pins);
+       u8 (*get_pins)(struct snd_tea575x *tea);
+       void (*set_direction)(struct snd_tea575x *tea, bool output);
 };
 
 struct snd_tea575x {
-       struct snd_card *card;
        struct video_device *vd;        /* video device */
        bool tea5759;                   /* 5759 chip is present */
        bool mute;                      /* Device is muted? */
        bool stereo;                    /* receiving stereo */
        bool tuned;                     /* tuned to a station */
-       unsigned int freq_fixup;        /* crystal onboard */
        unsigned int val;               /* hw value */
        unsigned long freq;             /* frequency */
        unsigned long in_use;           /* set if the device is in use */
        struct snd_tea575x_ops *ops;
        void *private_data;
+       u8 card[32];
+       u8 bus_info[32];
 };
 
-void snd_tea575x_init(struct snd_tea575x *tea);
+int snd_tea575x_init(struct snd_tea575x *tea);
 void snd_tea575x_exit(struct snd_tea575x *tea);
 
 #endif /* __SOUND_TEA575X_TUNER_H */