ALSA: tea575x: unify read/write functions

[linux-2.6.git] / include / sound / wss.h

diff --git a/include/sound/wss.h b/include/sound/wss.h
index 3b53973f96a7398fc7533709ae97e82062145f00..fd01f22825cdda88235ee4c05aa0a834af309258 100644 (file)
--- a/include/sound/wss.h
+++ b/include/sound/wss.h
@@ -55,6 +55,12 @@
 #define WSS_HW_CS4237B       0x0402    /* CS4237B - SRS 3D */
 #define WSS_HW_CS4238B 0x0403  /* CS4238B - QSOUND 3D */
 #define WSS_HW_CS4239  0x0404  /* CS4239 - Crystal Clear (tm) stereo enhancement */
+#define WSS_HW_AD1848_MASK     0x0800  /* AD1848 serie (half duplex) */
+#define WSS_HW_AD1847          0x0801  /* AD1847 chip */
+#define WSS_HW_AD1848          0x0802  /* AD1848 chip */
+#define WSS_HW_CS4248          0x0803  /* CS4248 chip */
+#define WSS_HW_CMI8330         0x0804  /* CMI8330 chip */
+#define WSS_HW_THINKPAD                0x0805  /* Thinkpad 360/750/755 */
 /* compatible, but clones */
 #define WSS_HW_INTERWAVE     0x1000    /* InterWave chip */
 #define WSS_HW_OPL3SA2       0x1101    /* OPL3-SA2 chip, similar to cs4231 */
@@ -65,6 +71,11 @@
 #define WSS_HWSHARE_DMA1       (1<<1)
 #define WSS_HWSHARE_DMA2       (1<<2)
 
+/* IBM Thinkpad specific stuff */
+#define AD1848_THINKPAD_CTL_PORT1              0x15e8
+#define AD1848_THINKPAD_CTL_PORT2              0x15e9
+#define AD1848_THINKPAD_CS4248_ENABLE_BIT      0x02
+
 struct snd_wss {
        unsigned long port;             /* base i/o port */
        struct resource *res_port;
@@ -77,8 +88,10 @@ struct snd_wss {
        unsigned short mode;            /* see to WSS_MODE_XXXX */
        unsigned short hardware;        /* see to WSS_HW_XXXX */
        unsigned short hwshare;         /* shared resources */
-       unsigned short single_dma:1,    /* forced single DMA mode (GUS 16-bit daughter board) or dma1 == dma2 */
-                      ebus_flag:1;     /* SPARC: EBUS present */
+       unsigned short single_dma:1,    /* forced single DMA mode (GUS 16-bit */
+                                       /* daughter board) or dma1 == dma2 */
+                      ebus_flag:1,     /* SPARC: EBUS present */
+                      thinkpad_flag:1; /* Thinkpad CS4248 needs extra help */
 
        struct snd_card *card;
        struct snd_pcm *pcm;
@@ -145,6 +158,8 @@ int snd_wss_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm);
 int snd_wss_timer(struct snd_wss *chip, int device, struct snd_timer **rtimer);
 int snd_wss_mixer(struct snd_wss *chip);
 
+const struct snd_pcm_ops *snd_wss_get_pcm_ops(int direction);
+
 int snd_cs4236_create(struct snd_card *card,
                      unsigned long port,
                      unsigned long cport,
@@ -185,6 +200,31 @@ int snd_wss_put_single(struct snd_kcontrol *kcontrol,
   .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | \
                   (shift_right << 19) | (mask << 24) | (invert << 22) }
 
+#define WSS_SINGLE_TLV(xname, xindex, reg, shift, mask, invert, xtlv) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+  .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ, \
+  .name = xname, \
+  .index = xindex, \
+  .info = snd_wss_info_single, \
+  .get = snd_wss_get_single, \
+  .put = snd_wss_put_single, \
+  .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24), \
+  .tlv = { .p = (xtlv) } }
+
+#define WSS_DOUBLE_TLV(xname, xindex, left_reg, right_reg, \
+                       shift_left, shift_right, mask, invert, xtlv) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, \
+  .access = SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_TLV_READ, \
+  .name = xname, \
+  .index = xindex, \
+  .info = snd_wss_info_double, \
+  .get = snd_wss_get_double, \
+  .put = snd_wss_put_double, \
+  .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | \
+                  (shift_right << 19) | (mask << 24) | (invert << 22), \
+  .tlv = { .p = (xtlv) } }
+
+
 int snd_wss_info_double(struct snd_kcontrol *kcontrol,
                        struct snd_ctl_elem_info *uinfo);
 int snd_wss_get_double(struct snd_kcontrol *kcontrol,