Merge branch 'tracing/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6] / sound / pci / ice1712 / ice1712.h

diff --git a/sound/pci/ice1712/ice1712.h b/sound/pci/ice1712/ice1712.h
index 4dc576af506f97886873214cd28bc379f3495325..762fbd7a750710dec0ede3ee426f20cc70668b2f 100644 (file)
--- a/sound/pci/ice1712/ice1712.h
+++ b/sound/pci/ice1712/ice1712.h
@@ -333,6 +333,8 @@ struct snd_ice1712 {
        unsigned int has_spdif: 1;      /* VT1720/4 - has SPDIF I/O */
        unsigned int force_pdma4: 1;    /* VT1720/4 - PDMA4 as non-spdif */
        unsigned int force_rdma1: 1;    /* VT1720/4 - RDMA1 as non-spdif */
+       unsigned int midi_output: 1;    /* VT1720/4: MIDI output triggered */
+       unsigned int midi_input: 1;     /* VT1720/4: MIDI input triggered */
        unsigned int num_total_dacs;    /* total DACs */
        unsigned int num_total_adcs;    /* total ADCs */
        unsigned int cur_rate;          /* current rate */
@@ -366,49 +368,15 @@ struct snd_ice1712 {
        struct mutex gpio_mutex;
 
        /* other board-specific data */
-       union {
-               /* additional i2c devices for EWS boards */
-               struct snd_i2c_device *i2cdevs[3];
-               /* AC97 register cache for Aureon */
-               struct aureon_spec {
-                       unsigned short stac9744[64];
-                       unsigned int cs8415_mux;
-                       unsigned short master[2];
-                       unsigned short vol[8];
-                       unsigned char pca9554_out;
-               } aureon;
-               /* AC97 register cache for Phase28 */
-               struct phase28_spec {
-                       unsigned short master[2];
-                       unsigned short vol[8];
-               } phase28;
-               /* a non-standard I2C device for revo51 */
-               struct revo51_spec {
-                       struct snd_i2c_device *dev;
-                       struct snd_pt2258 *pt2258;
-               } revo51;
-               /* Hoontech-specific setting */
-               struct hoontech_spec {
-                       unsigned char boxbits[4];
-                       unsigned int config;
-                       unsigned short boxconfig[4];
-               } hoontech;
-               struct {
-                       struct ak4114 *ak4114;
-                       unsigned int analog: 1;
-               } juli;
-               struct {
-                       struct ak4114 *ak4114;
-                       /* rate change needs atomic mute/unmute of all dacs*/
-                       struct mutex mute_mutex;
-               } prodigy192;
-               struct {
-                       struct {
-                               unsigned char ch1, ch2;
-                       } vol[8];
-               } se;
-
-       } spec;
+       void *spec;
+
+       /* VT172x specific */
+       int pro_rate_default;
+       int (*is_spdif_master)(struct snd_ice1712 *ice);
+       unsigned int (*get_rate)(struct snd_ice1712 *ice);
+       void (*set_rate)(struct snd_ice1712 *ice, unsigned int rate);
+       unsigned char (*set_mclk)(struct snd_ice1712 *ice, unsigned int rate);
+       void (*set_spdif_clock)(struct snd_ice1712 *ice);
 
 };
 
@@ -472,10 +440,14 @@ int snd_ice1712_gpio_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_valu
 static inline void snd_ice1712_gpio_write_bits(struct snd_ice1712 *ice,
                                               unsigned int mask, unsigned int bits)
 {
+       unsigned val;
+
        ice->gpio.direction |= mask;
        snd_ice1712_gpio_set_dir(ice, ice->gpio.direction);
-       snd_ice1712_gpio_set_mask(ice, ~mask);
-       snd_ice1712_gpio_write(ice, mask & bits);
+       val = snd_ice1712_gpio_read(ice);
+       val &= ~mask;
+       val |= mask & bits;
+       snd_ice1712_gpio_write(ice, val);
 }
 
 static inline int snd_ice1712_gpio_read_bits(struct snd_ice1712 *ice,