ALSA: wss_lib: use wss constants instead of ad1848 ones

Use wss constants for mode.
Move ad1848 hardware constants to the wss.h.
Move mixer tlv macros into the ad1848_lib.c from the ad1848.h.

Drop the MODE_RUNNING spurious IRQ guard on AD1848 as it doesn not seem
to be needed.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Reviewed-by: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

2 files changed, 6 insertions, 32 deletions

diff --git a/include/sound/ad1848.h b/include/sound/ad1848.h
index d740e633e81b..a881d5173c64 100644
--- a/include/sound/ad1848.h
+++ b/include/sound/ad1848.h
@@ -106,24 +106,6 @@
 #define AD1848_CALIB_IN_PROGRESS 0x20   /* auto calibrate in progress */
 #define AD1848_DMA_REQUEST      0x10    /* DMA request in progress */
 
-/* defines for codec.mode */
-
-#define AD1848_MODE_NONE        0x0000
-#define AD1848_MODE_PLAY        0x0001
-#define AD1848_MODE_CAPTURE     0x0002
-#define AD1848_MODE_TIMER       0x0004
-#define AD1848_MODE_OPEN        (AD1848_MODE_PLAY|AD1848_MODE_CAPTURE|AD1848_MODE_TIMER)
-#define AD1848_MODE_RUNNING     0x0010
-
-/* defines for codec.hardware */
-
-#define AD1848_HW_DETECT        0x0000  /* let AD1848 driver detect chip */
-#define AD1848_HW_AD1847        0x0001  /* AD1847 chip */
-#define AD1848_HW_AD1848        0x0002  /* AD1848 chip */
-#define AD1848_HW_CS4248        0x0003  /* CS4248 chip */
-#define AD1848_HW_CMI8330       0x0004  /* CMI8330 chip */
-#define AD1848_HW_THINKPAD      0x0005  /* Thinkpad 360/750/755 */
-
 /* IBM Thinkpad specific stuff */
 #define AD1848_THINKPAD_CTL_PORT1               0x15e8
 #define AD1848_THINKPAD_CTL_PORT2               0x15e9
@@ -167,26 +149,12 @@ struct ad1848_mix_elem {
   .type = AD1848_MIX_SINGLE, \
   .private_value = AD1848_MIXVAL_SINGLE(reg, shift, mask, invert) }
 
-#define AD1848_SINGLE_TLV(xname, xindex, reg, shift, mask, invert, xtlv) \
-{ .name = xname, \
-  .index = xindex, \
-  .type = AD1848_MIX_SINGLE, \
-  .private_value = AD1848_MIXVAL_SINGLE(reg, shift, mask, invert), \
-  .tlv = xtlv }
-
 #define AD1848_DOUBLE(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert) \
 { .name = xname, \
   .index = xindex, \
   .type = AD1848_MIX_DOUBLE, \
   .private_value = AD1848_MIXVAL_DOUBLE(left_reg, right_reg, shift_left, shift_right, mask, invert) }
 
-#define AD1848_DOUBLE_TLV(xname, xindex, left_reg, right_reg, shift_left, shift_right, mask, invert, xtlv) \
-{ .name = xname, \
-  .index = xindex, \
-  .type = AD1848_MIX_DOUBLE, \
-  .private_value = AD1848_MIXVAL_DOUBLE(left_reg, right_reg, shift_left, shift_right, mask, invert), \
-  .tlv = xtlv }
-
 int snd_ad1848_add_ctl_elem(struct snd_wss *chip,
                             const struct ad1848_mix_elem *c);
 
diff --git a/include/sound/wss.h b/include/sound/wss.h
index 1e0dc77f0d25..2cc1f1462d8e 100644
--- 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 */